| Message ID | 1478553376-18575-4-git-send-email-alexander.deucher@amd.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
2016-11-07 Alex Deucher <alexdeucher@gmail.com>: > From: Christian König <christian.koenig@amd.com> > > This reverts commit fb8b7d2b9d80e1e71f379e57355936bd2b024be9. > > Otherwise signaling might never be activated on the fences. This can > result in infinite waiting with hardware which has unreliable interrupts. > > v2: still return one when the timeout is zero and we don't have any fences. > > Reviewed-by: Alex Deucher <alexander.deucher@amd.com> > Signed-off-by: Christian König <christian.koenig@amd.com> > Reviewed-by: Chunming Zhou <david1.zhou@amd.com> (v1) > Signed-off-by: Alex Deucher <alexander.deucher@amd.com> > --- > drivers/dma-buf/reservation.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) You left all my r-b out. For the whole series: Reviewed-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk> Gustavo
diff --git a/drivers/dma-buf/reservation.c b/drivers/dma-buf/reservation.c index 7ed56f3..393817e 100644 --- a/drivers/dma-buf/reservation.c +++ b/drivers/dma-buf/reservation.c @@ -370,10 +370,7 @@ long reservation_object_wait_timeout_rcu(struct reservation_object *obj, { struct dma_fence *fence; unsigned seq, shared_count, i = 0; - long ret = timeout; - - if (!timeout) - return reservation_object_test_signaled_rcu(obj, wait_all); + long ret = timeout ? timeout : 1; retry: fence = NULL;