From: "Christian König" <ckoenig.leichtzumerken@gmail.com>
To: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] [PATCH 06/25] dma-buf: use new iterator in dma_resv_test_signaled
Date: Thu, 23 Sep 2021 09:55:49 +0200 [thread overview]
Message-ID: <20210923075608.2873-6-christian.koenig@amd.com> (raw)
In-Reply-To: <20210923075608.2873-1-christian.koenig@amd.com>
This makes the function much simpler since the complex
retry logic is now handled elsewhere.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
drivers/dma-buf/dma-resv.c | 57 +++++---------------------------------
1 file changed, 7 insertions(+), 50 deletions(-)
diff --git a/drivers/dma-buf/dma-resv.c b/drivers/dma-buf/dma-resv.c
index 2b86444034d4..266ec9e3caef 100644
--- a/drivers/dma-buf/dma-resv.c
+++ b/drivers/dma-buf/dma-resv.c
@@ -625,22 +625,6 @@ long dma_resv_wait_timeout(struct dma_resv *obj, bool wait_all, bool intr,
EXPORT_SYMBOL_GPL(dma_resv_wait_timeout);
-static inline int dma_resv_test_signaled_single(struct dma_fence *passed_fence)
-{
- struct dma_fence *fence, *lfence = passed_fence;
- int ret = 1;
-
- if (!test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &lfence->flags)) {
- fence = dma_fence_get_rcu(lfence);
- if (!fence)
- return -1;
-
- ret = !!dma_fence_is_signaled(fence);
- dma_fence_put(fence);
- }
- return ret;
-}
-
/**
* dma_resv_test_signaled - Test if a reservation object's fences have been
* signaled.
@@ -657,43 +641,16 @@ static inline int dma_resv_test_signaled_single(struct dma_fence *passed_fence)
*/
bool dma_resv_test_signaled(struct dma_resv *obj, bool test_all)
{
+ struct dma_resv_iter cursor;
struct dma_fence *fence;
- unsigned int seq;
- int ret;
-
- rcu_read_lock();
-retry:
- ret = true;
- seq = read_seqcount_begin(&obj->seq);
-
- if (test_all) {
- struct dma_resv_list *fobj = dma_resv_shared_list(obj);
- unsigned int i, shared_count;
-
- shared_count = fobj ? fobj->shared_count : 0;
- for (i = 0; i < shared_count; ++i) {
- fence = rcu_dereference(fobj->shared[i]);
- ret = dma_resv_test_signaled_single(fence);
- if (ret < 0)
- goto retry;
- else if (!ret)
- break;
- }
- }
-
- fence = dma_resv_excl_fence(obj);
- if (ret && fence) {
- ret = dma_resv_test_signaled_single(fence);
- if (ret < 0)
- goto retry;
+ dma_resv_iter_begin(&cursor, obj, test_all);
+ dma_resv_for_each_fence_unlocked(&cursor, fence) {
+ dma_resv_iter_end(&cursor);
+ return false;
}
-
- if (read_seqcount_retry(&obj->seq, seq))
- goto retry;
-
- rcu_read_unlock();
- return ret;
+ dma_resv_iter_end(&cursor);
+ return true;
}
EXPORT_SYMBOL_GPL(dma_resv_test_signaled);
--
2.25.1
next prev parent reply other threads:[~2021-09-23 11:57 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-23 7:55 [Intel-gfx] [PATCH 01/25] dma-buf: add dma_resv_for_each_fence_unlocked v5 Christian König
2021-09-23 7:55 ` [Intel-gfx] [PATCH 02/25] dma-buf: add dma_resv_for_each_fence Christian König
2021-09-23 7:55 ` [Intel-gfx] [PATCH 03/25] dma-buf: use new iterator in dma_resv_copy_fences Christian König
2021-09-23 7:55 ` [Intel-gfx] [PATCH 04/25] dma-buf: use new iterator in dma_resv_get_fences v3 Christian König
2021-09-23 7:55 ` [Intel-gfx] [PATCH 05/25] dma-buf: use new iterator in dma_resv_wait_timeout Christian König
2021-09-23 7:55 ` Christian König [this message]
2021-09-23 7:55 ` [Intel-gfx] [PATCH 07/25] drm/ttm: use the new iterator in ttm_bo_flush_all_fences Christian König
2021-09-23 7:55 ` [Intel-gfx] [PATCH 08/25] drm/amdgpu: use the new iterator in amdgpu_sync_resv Christian König
2021-09-23 7:55 ` [Intel-gfx] [PATCH 09/25] drm/amdgpu: use new iterator in amdgpu_ttm_bo_eviction_valuable Christian König
2021-09-23 7:55 ` [Intel-gfx] [PATCH 10/25] drm/amdgpu: use new iterator in amdgpu_vm_prt_fini Christian König
2021-09-23 7:55 ` [Intel-gfx] [PATCH 11/25] drm/msm: use new iterator in msm_gem_describe Christian König
2021-09-23 7:55 ` [Intel-gfx] [PATCH 12/25] drm/radeon: use new iterator in radeon_sync_resv Christian König
2021-09-23 7:55 ` [Intel-gfx] [PATCH 13/25] drm/scheduler: use new iterator in drm_sched_job_add_implicit_dependencies v2 Christian König
2021-09-23 7:55 ` [Intel-gfx] [PATCH 14/25] drm/i915: use the new iterator in i915_gem_busy_ioctl v2 Christian König
2021-09-24 9:08 ` Tvrtko Ursulin
2021-09-23 7:55 ` [Intel-gfx] [PATCH 15/25] drm/i915: use the new iterator in i915_sw_fence_await_reservation v3 Christian König
2021-09-23 7:55 ` [Intel-gfx] [PATCH 16/25] drm/i915: use the new iterator in i915_request_await_object v2 Christian König
2021-09-23 7:56 ` [Intel-gfx] [PATCH 17/25] drm/i915: use new iterator in i915_gem_object_wait_reservation Christian König
2021-09-23 7:56 ` [Intel-gfx] [PATCH 18/25] drm/i915: use new iterator in i915_gem_object_wait_priority Christian König
2021-09-23 7:56 ` [Intel-gfx] [PATCH 19/25] drm/i915: use new cursor in intel_prepare_plane_fb Christian König
2021-09-23 7:56 ` [Intel-gfx] [PATCH 20/25] drm: use new iterator in drm_gem_fence_array_add_implicit v3 Christian König
2021-09-23 7:56 ` [Intel-gfx] [PATCH 21/25] drm: use new iterator in drm_gem_plane_helper_prepare_fb Christian König
2021-09-23 7:56 ` [Intel-gfx] [PATCH 22/25] drm/nouveau: use the new iterator in nouveau_fence_sync Christian König
2021-09-23 7:56 ` [Intel-gfx] [PATCH 23/25] drm/nouveau: use the new interator in nv50_wndw_prepare_fb Christian König
2021-09-23 7:56 ` [Intel-gfx] [PATCH 24/25] drm/etnaviv: use new iterator in etnaviv_gem_describe Christian König
2021-09-23 7:56 ` [Intel-gfx] [PATCH 25/25] drm/etnaviv: replace dma_resv_get_excl_unlocked Christian König
2021-09-23 12:32 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [01/25] dma-buf: add dma_resv_for_each_fence_unlocked v5 Patchwork
2021-09-23 12:35 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2021-09-23 13:05 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
2021-09-24 9:11 ` Tvrtko Ursulin
2021-09-24 9:13 ` Christian König
2021-09-24 10:08 ` Tvrtko Ursulin
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=20210923075608.2873-6-christian.koenig@amd.com \
--to=ckoenig.leichtzumerken@gmail.com \
--cc=intel-gfx@lists.freedesktop.org \
/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).