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
Cc: daniel@ffwll.ch
Subject: [PATCH 12/14] drm/msm: use new iterator in msm_gem_describe
Date: Fri, 10 Sep 2021 10:26:53 +0200 [thread overview]
Message-ID: <20210910082655.82168-12-christian.koenig@amd.com> (raw)
In-Reply-To: <20210910082655.82168-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 5db07fc287ad..8ee4e8881b03 100644
--- a/drivers/gpu/drm/msm/msm_gem.c
+++ b/drivers/gpu/drm/msm/msm_gem.c
@@ -906,7 +906,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_cursor cursor;
struct dma_fence *fence;
struct msm_gem_vma *vma;
uint64_t off = drm_vma_node_start(&obj->vma_node);
@@ -981,22 +981,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(robj, &cursor, true, fence) {
+ if (cursor.is_exclusive)
+ 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-10 8:27 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-10 8:26 [PATCH 01/14] dma-buf: add dma_resv_for_each_fence_unlocked Christian König
2021-09-10 8:26 ` [PATCH 02/14] dma-buf: add dma_resv_for_each_fence Christian König
2021-09-10 8:26 ` [PATCH 03/14] dma-buf: use new iterator in dma_resv_copy_fences Christian König
2021-09-10 8:26 ` [PATCH 04/14] dma-buf: use new iterator in dma_resv_get_fences Christian König
2021-09-11 12:54 ` kernel test robot
2021-09-11 12:54 ` [PATCH] dma-buf: fix noderef.cocci warnings kernel test robot
2021-09-10 8:26 ` [PATCH 05/14] dma-buf: use new iterator in dma_resv_wait_timeout Christian König
2021-09-10 8:26 ` [PATCH 06/14] dma-buf: use new iterator in dma_resv_test_signaled Christian König
2021-09-10 8:26 ` [PATCH 07/14] drm/i915: use the new iterator in i915_gem_busy_ioctl Christian König
2021-09-10 8:26 ` [PATCH 08/14] drm/ttm: use the new iterator in ttm_bo_flush_all_fences Christian König
2021-09-10 8:26 ` [PATCH 09/14] drm/etnaviv: use new iterator in etnaviv_gem_describe Christian König
2021-09-10 8:26 ` [PATCH 10/14] drm/amdgpu: use the new iterator in amdgpu_sync_resv Christian König
2021-09-10 8:26 ` [PATCH 11/14] drm/amdgpu: use new iterator in amdgpu_ttm_bo_eviction_valuable Christian König
2021-09-10 8:26 ` Christian König [this message]
2021-09-10 8:26 ` [PATCH 13/14] drm/nouveau: use the new iterator in nouveau_fence_sync Christian König
2021-09-10 8:26 ` [PATCH 14/14] drm/radeon: use new iterator in radeon_sync_resv Christian König
2021-09-14 14:41 ` [PATCH 01/14] dma-buf: add dma_resv_for_each_fence_unlocked Daniel Vetter
2021-09-14 17:04 ` Daniel Vetter
2021-09-16 8:50 ` Christian König
2021-09-16 12:14 ` Daniel Vetter
2021-09-16 12:49 ` Christian König
2021-09-16 14:09 ` Daniel Vetter
2021-09-17 6:32 ` Christian König
2021-09-17 12:22 ` Daniel Vetter
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=20210910082655.82168-12-christian.koenig@amd.com \
--to=ckoenig.leichtzumerken@gmail.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=linaro-mm-sig@lists.linaro.org \
--cc=linux-media@vger.kernel.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).