Commit 998a7aa1 authored Aug 29, 2016 by Chris Wilson Committed by Sumit Semwal Oct 12, 2016

drm/vmwgfx: Remove call to reservation_object_test_signaled_rcu before wait



Since fence_wait_timeout_reservation_object_wait_timeout_rcu() with a
timeout of 0 becomes reservation_object_test_signaled_rcu(), we do not
need to handle such conversion in the caller. The only challenge are
those callers that wish to differentiate the error code between the
nonblocking busy check and potentially blocking wait.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Sinclair Yeh <syeh@vmware.com>
Cc: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Sinclair Yeh <syeh@vmware.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Sumit Semwal <sumit.semwal@linaro.org>
Link: http://patchwork.freedesktop.org/patch/msgid/20160829070834.22296-5-chris@chris-wilson.co.uk

parent 491d8a1d

drivers/gpu/drm/vmwgfx/vmwgfx_resource.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -574,10 +574,8 @@ static int vmw_user_dmabuf_synccpu_grab(struct vmw_user_dma_buffer *user_bo,
		bool nonblock = !!(flags & drm_vmw_synccpu_dontblock);
		long lret;

		if (nonblock)
		return reservation_object_test_signaled_rcu(bo->resv, true) ? 0 : -EBUSY;

		lret = reservation_object_wait_timeout_rcu(bo->resv, true, true, MAX_SCHEDULE_TIMEOUT);
		lret = reservation_object_wait_timeout_rcu(bo->resv, true, true,
		nonblock ? 0 : MAX_SCHEDULE_TIMEOUT);
		if (!lret)
		return -EBUSY;
		else if (lret < 0)

Admin message