Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b85bcea authored by Alex Deucher's avatar Alex Deucher Committed by Marissa Wall
Browse files

BACKPORT: dma-buf/fence: revert "don't wait when specified timeout is zero" (v2) 



Reverts commit 847b19a3
	("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: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarChunming Zhou <david1.zhou@amd.com>
Reviewed-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarSumit Semwal <sumit.semwal@linaro.org>
  [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: default avatarMarissa Wall <marissaw@google.com>

Change-Id: I6a0d72034ecec3832c90864291bc5674da8a0b5d
parent a2837749

drivers/dma-buf/fence.c

+0 −3
Original line number Diff line number Diff line
@@ -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);