From: Chris Wilson <chris@chris-wilson.co.uk>
To: dri-devel@lists.freedesktop.org
Cc: intel-gfx@lists.freedesktop.org,
Thomas Hellstrom <thellstrom@vmware.com>
Subject: [PATCH 05/11] drm/vmwgfx: Remove call to reservation_object_test_signaled_rcu before wait
Date: Mon, 29 Aug 2016 08:08:28 +0100 [thread overview]
Message-ID: <20160829070834.22296-5-chris@chris-wilson.co.uk> (raw)
In-Reply-To: <20160829070834.22296-1-chris@chris-wilson.co.uk>
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>
---
drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
index 6a328d507a28..1a85fb2d4dc6 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
@@ -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)
--
2.9.3
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2016-08-29 7:08 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-29 7:08 [PATCH 01/11] drm/amdgpu: Remove call to reservation_object_test_signaled_rcu before wait Chris Wilson
2016-08-29 7:08 ` [PATCH 02/11] drm/etnaviv: Remove manual " Chris Wilson
2016-09-23 12:55 ` Daniel Vetter
2016-10-05 16:15 ` Sumit Semwal
2016-10-10 13:17 ` Lucas Stach
2016-08-29 7:08 ` [PATCH 03/11] drm/msm: Remove " Chris Wilson
2016-09-23 12:55 ` Daniel Vetter
2016-09-23 13:07 ` [Intel-gfx] " Rob Clark
2016-08-29 7:08 ` [PATCH 04/11] drm/nouveau: " Chris Wilson
2016-09-23 12:55 ` Daniel Vetter
2016-10-05 16:05 ` Sumit Semwal
2016-08-29 7:08 ` Chris Wilson [this message]
2016-09-23 12:56 ` [PATCH 05/11] drm/vmwgfx: " Daniel Vetter
2016-10-05 16:11 ` [Intel-gfx] " Sumit Semwal
2016-10-05 17:03 ` Sinclair Yeh
2016-08-29 7:08 ` [PATCH 06/11] dma-buf: Introduce fence_get_rcu_safe() Chris Wilson
2016-09-23 12:59 ` Daniel Vetter
2016-09-23 13:34 ` Markus Heiser
2016-08-29 7:08 ` [PATCH 07/11] dma-buf: Restart reservation_object_get_fences_rcu() after writes Chris Wilson
2016-09-23 13:03 ` Daniel Vetter
2016-08-29 7:08 ` [PATCH 08/11] dma-buf: Restart reservation_object_wait_timeout_rcu() " Chris Wilson
2016-09-23 13:18 ` Daniel Vetter
2016-08-29 7:08 ` [PATCH 09/11] dma-buf: Restart reservation_object_test_signaled_rcu() " Chris Wilson
2016-09-23 13:43 ` Daniel Vetter
2016-08-29 7:08 ` [PATCH 10/11] dma-buf: Use seqlock to close RCU race in test_signaled_single Chris Wilson
2016-09-23 13:49 ` [Linaro-mm-sig] " Daniel Vetter
2016-09-23 14:02 ` Chris Wilson
2016-09-25 20:43 ` Daniel Vetter
2016-08-29 7:08 ` [PATCH 11/11] dma-buf: Do a fast lockless check for poll with timeout=0 Chris Wilson
2016-08-29 18:16 ` [PATCH] dma-buf/sync-file: Avoid enable fence signaling if poll(.timeout=0) Chris Wilson
2016-08-29 18:26 ` Gustavo Padovan
2016-09-13 14:46 ` Sumit Semwal
2016-09-15 0:00 ` Rafael Antognolli
2016-09-21 7:26 ` Gustavo Padovan
2016-09-21 11:08 ` Chris Wilson
2016-09-23 13:50 ` [Intel-gfx] [PATCH 11/11] dma-buf: Do a fast lockless check for poll with timeout=0 Daniel Vetter
2016-09-23 14:15 ` Chris Wilson
2016-09-23 15:06 ` Chris Wilson
2016-09-23 15:20 ` [Intel-gfx] " Chris Wilson
2016-09-23 17:59 ` Christian König
2016-09-25 20:44 ` Daniel Vetter
2016-08-29 8:20 ` [PATCH 01/11] drm/amdgpu: Remove call to reservation_object_test_signaled_rcu before wait Christian König
2016-09-23 12:54 ` Daniel Vetter
2016-10-05 16:03 ` Sumit Semwal
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160829070834.22296-5-chris@chris-wilson.co.uk \
--to=chris@chris-wilson.co.uk \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=thellstrom@vmware.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).