From: "Christian König" <ckoenig.leichtzumerken@gmail.com>
To: linaro-mm-sig@lists.linaro.org, dri-devel@lists.freedesktop.org,
linux-media@vger.kernel.org, intel-gfx@lists.freedesktop.org
Cc: daniel@ffwll.ch, tvrtko.ursulin@linux.intel.com
Subject: [Intel-gfx] [PATCH 13/27] drm/msm: use new iterator in msm_gem_describe
Date: Fri, 24 Sep 2021 17:30:59 +0200 [thread overview]
Message-ID: <20210924153113.2159-13-christian.koenig@amd.com> (raw)
In-Reply-To: <20210924153113.2159-1-christian.koenig@amd.com>
Simplifying the code a bit. Also drop the RCU read side lock since the
object is locked anyway.
Untested since I can't get the driver to compile on !ARM.
Signed-off-by: Christian König <christian.koenig@amd.com>
---
drivers/gpu/drm/msm/msm_gem.c | 19 +++++--------------
1 file changed, 5 insertions(+), 14 deletions(-)
diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c
index 22308a1b66fc..14907622769f 100644
--- a/drivers/gpu/drm/msm/msm_gem.c
+++ b/drivers/gpu/drm/msm/msm_gem.c
@@ -880,7 +880,7 @@ void msm_gem_describe(struct drm_gem_object *obj, struct seq_file *m,
{
struct msm_gem_object *msm_obj = to_msm_bo(obj);
struct dma_resv *robj = obj->resv;
- struct dma_resv_list *fobj;
+ struct dma_resv_iter cursor;
struct dma_fence *fence;
struct msm_gem_vma *vma;
uint64_t off = drm_vma_node_start(&obj->vma_node);
@@ -955,22 +955,13 @@ void msm_gem_describe(struct drm_gem_object *obj, struct seq_file *m,
seq_puts(m, "\n");
}
- rcu_read_lock();
- fobj = dma_resv_shared_list(robj);
- if (fobj) {
- unsigned int i, shared_count = fobj->shared_count;
-
- for (i = 0; i < shared_count; i++) {
- fence = rcu_dereference(fobj->shared[i]);
+ dma_resv_for_each_fence(&cursor, robj, true, fence) {
+ if (dma_resv_iter_is_exclusive(&cursor))
+ describe_fence(fence, "Exclusive", m);
+ else
describe_fence(fence, "Shared", m);
- }
}
- fence = dma_resv_excl_fence(robj);
- if (fence)
- describe_fence(fence, "Exclusive", m);
- rcu_read_unlock();
-
msm_gem_unlock(obj);
}
--
2.25.1
next prev parent reply other threads:[~2021-09-24 16:21 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-24 15:30 [Intel-gfx] [PATCH 01/27] dma-buf: add dma_resv_for_each_fence_unlocked v6 Christian König
2021-09-24 15:30 ` [Intel-gfx] [PATCH 02/27] dma-buf: add dma_resv_for_each_fence Christian König
2021-09-24 15:30 ` [Intel-gfx] [PATCH 03/27] dma-buf: add dma_resv selftest Christian König
2021-09-24 15:30 ` [Intel-gfx] [PATCH 04/27] dma-buf: use new iterator in dma_resv_copy_fences Christian König
2021-09-24 15:30 ` [Intel-gfx] [PATCH 05/27] dma-buf: use new iterator in dma_resv_get_fences v3 Christian König
2021-09-24 15:30 ` [Intel-gfx] [PATCH 06/27] dma-buf: use new iterator in dma_resv_wait_timeout Christian König
2021-09-24 15:30 ` [Intel-gfx] [PATCH 07/27] dma-buf: use new iterator in dma_resv_test_signaled Christian König
2021-09-24 15:30 ` [Intel-gfx] [PATCH 08/27] dma-buf: use the new iterator in dma_buf_debug_show Christian König
2021-09-24 15:30 ` [Intel-gfx] [PATCH 09/27] drm/ttm: use the new iterator in ttm_bo_flush_all_fences Christian König
2021-09-24 15:30 ` [Intel-gfx] [PATCH 10/27] drm/amdgpu: use the new iterator in amdgpu_sync_resv Christian König
2021-09-24 15:30 ` [Intel-gfx] [PATCH 11/27] drm/amdgpu: use new iterator in amdgpu_ttm_bo_eviction_valuable Christian König
2021-09-24 15:30 ` [Intel-gfx] [PATCH 12/27] drm/amdgpu: use new iterator in amdgpu_vm_prt_fini Christian König
2021-09-24 15:30 ` Christian König [this message]
2021-09-24 15:31 ` [Intel-gfx] [PATCH 14/27] drm/radeon: use new iterator in radeon_sync_resv Christian König
2021-09-24 15:31 ` [Intel-gfx] [PATCH 15/27] drm/scheduler: use new iterator in drm_sched_job_add_implicit_dependencies v2 Christian König
2021-09-24 15:31 ` [Intel-gfx] [PATCH 16/27] drm/i915: use the new iterator in i915_gem_busy_ioctl v2 Christian König
2021-09-24 15:31 ` [Intel-gfx] [PATCH 17/27] drm/i915: use the new iterator in i915_sw_fence_await_reservation v3 Christian König
2021-09-24 15:31 ` [Intel-gfx] [PATCH 18/27] drm/i915: use the new iterator in i915_request_await_object v2 Christian König
2021-09-24 15:31 ` [Intel-gfx] [PATCH 19/27] drm/i915: use new iterator in i915_gem_object_wait_reservation Christian König
2021-09-24 15:31 ` [Intel-gfx] [PATCH 20/27] drm/i915: use new iterator in i915_gem_object_wait_priority Christian König
2021-09-24 15:31 ` [Intel-gfx] [PATCH 21/27] drm/i915: use new cursor in intel_prepare_plane_fb Christian König
2021-09-24 15:31 ` [Intel-gfx] [PATCH 22/27] drm: use new iterator in drm_gem_fence_array_add_implicit v3 Christian König
2021-09-24 15:31 ` [Intel-gfx] [PATCH 23/27] drm: use new iterator in drm_gem_plane_helper_prepare_fb Christian König
2021-09-24 15:31 ` [Intel-gfx] [PATCH 24/27] drm/nouveau: use the new iterator in nouveau_fence_sync Christian König
2021-09-24 15:31 ` [Intel-gfx] [PATCH 25/27] drm/nouveau: use the new interator in nv50_wndw_prepare_fb Christian König
2021-09-24 15:31 ` [Intel-gfx] [PATCH 26/27] drm/etnaviv: use new iterator in etnaviv_gem_describe Christian König
2021-09-24 15:31 ` [Intel-gfx] [PATCH 27/27] drm/etnaviv: replace dma_resv_get_excl_unlocked Christian König
2021-09-24 20:21 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [01/27] dma-buf: add dma_resv_for_each_fence_unlocked v6 Patchwork
2021-09-24 20:23 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2021-09-24 20:53 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
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=20210924153113.2159-13-christian.koenig@amd.com \
--to=ckoenig.leichtzumerken@gmail.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=linaro-mm-sig@lists.linaro.org \
--cc=linux-media@vger.kernel.org \
--cc=tvrtko.ursulin@linux.intel.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).