On Wed, Oct 19, 2016 at 1:59 PM, Christian König
<deathsimple@xxxxxxxxxxx> wrote:
> From: Christian König <christian.koenig@xxxxxxx>
>
> Return one when the timeout is zero and we don't got any fences.
>
> Fixes "reservation: revert "wait only with non-zero timeout specified (v3)"".
>
> Signed-off-by: Christian König <christian.koenig@xxxxxxx>
Reviewed-by: Alex Deucher <alexander.deucher@xxxxxxx>
You should make sure you cc Sumit on these patches as I think they
would need to go upstream via the dma-buf tree. Also respin a v2
with this fix integrated.
Alex
> ---
> drivers/dma-buf/reservation.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/dma-buf/reservation.c b/drivers/dma-buf/reservation.c
> index bb97b04..debb91d 100644
> --- a/drivers/dma-buf/reservation.c
> +++ b/drivers/dma-buf/reservation.c
> @@ -379,7 +379,7 @@ long reservation_object_wait_timeout_rcu(struct reservation_object *obj,
> {
> struct fence *fence;
> unsigned seq, shared_count, i = 0;
> - long ret = timeout;
> + long ret = timeout ? timeout : 1;
>
> retry:
> fence = NULL;
> --
> 2.5.0
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
