From 4b85bcea3c7239fbd0e48400adab5d3810236dec Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Mon, 7 Nov 2016 16:16:14 -0500 Subject: [PATCH] BACKPORT: dma-buf/fence: revert "don't wait when specified timeout is zero" (v2) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reverts commit 847b19a39e4c ("dma-buf/fence: don't wait when specified timeout is zero") When we don't call the wait function software signaling might never be activated. This can cause infinite polling loops with unreliable interrupt driven hardware. v2: rebase on drm-next Reviewed-by: Alex Deucher Signed-off-by: Christian König Reviewed-by: Chunming Zhou Reviewed-by: Gustavo Padovan Signed-off-by: Alex Deucher Signed-off-by: Sumit Semwal [sumits: reword commit msg for checkpatch warnings] Link: http://patchwork.freedesktop.org/patch/msgid/1478553376-18575-2-git-send-email-alexander.deucher@amd.com (cherry picked from commit 698c0f7ff21674ec08a4c6e99dd6da62fe5a344d) Signed-off-by: Marissa Wall Change-Id: I6a0d72034ecec3832c90864291bc5674da8a0b5d --- drivers/dma-buf/fence.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/dma-buf/fence.c b/drivers/dma-buf/fence.c index 88d03a11b27f..094548bcb9cf 100644 --- a/drivers/dma-buf/fence.c +++ b/drivers/dma-buf/fence.c @@ -161,9 +161,6 @@ fence_wait_timeout(struct fence *fence, bool intr, signed long timeout) if (WARN_ON(timeout < 0)) return -EINVAL; - if (timeout == 0) - return fence_is_signaled(fence); - trace_fence_wait_start(fence); ret = fence->ops->wait(fence, intr, timeout); trace_fence_wait_end(fence);