[13/27] drm/msm: use new iterator in msm_gem_describe

Message ID	20210924153113.2159-13-christian.koenig@amd.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <linux-media-owner@kernel.org> From: " =?utf-8?q?Christian_K=C3=B6nig?= " <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: [PATCH 13/27] drm/msm: use new iterator in msm_gem_describe Date: Fri, 24 Sep 2021 17:30:59 +0200 Message-Id: <20210924153113.2159-13-christian.koenig@amd.com> In-Reply-To: <20210924153113.2159-1-christian.koenig@amd.com> References: <20210924153113.2159-1-christian.koenig@amd.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	[01/27] dma-buf: add dma_resv_for_each_fence_unlocked v6 \| expand [01/27] dma-buf: add dma_resv_for_each_fence_unlocked v6 [02/27] dma-buf: add dma_resv_for_each_fence [03/27] dma-buf: add dma_resv selftest [04/27] dma-buf: use new iterator in dma_resv_copy_fences [05/27] dma-buf: use new iterator in dma_resv_get_fences v3 [06/27] dma-buf: use new iterator in dma_resv_wait_timeout [07/27] dma-buf: use new iterator in dma_resv_test_signaled [08/27] dma-buf: use the new iterator in dma_buf_debug_show [09/27] drm/ttm: use the new iterator in ttm_bo_flush_all_fences [10/27] drm/amdgpu: use the new iterator in amdgpu_sync_resv [11/27] drm/amdgpu: use new iterator in amdgpu_ttm_bo_eviction_valuable [12/27] drm/amdgpu: use new iterator in amdgpu_vm_prt_fini [13/27] drm/msm: use new iterator in msm_gem_describe [14/27] drm/radeon: use new iterator in radeon_sync_resv [15/27] drm/scheduler: use new iterator in drm_sched_job_add_implicit_dependencies v2 [16/27] drm/i915: use the new iterator in i915_gem_busy_ioctl v2 [17/27] drm/i915: use the new iterator in i915_sw_fence_await_reservation v3 [18/27] drm/i915: use the new iterator in i915_request_await_object v2 [19/27] drm/i915: use new iterator in i915_gem_object_wait_reservation [20/27] drm/i915: use new iterator in i915_gem_object_wait_priority [21/27] drm/i915: use new cursor in intel_prepare_plane_fb [22/27] drm: use new iterator in drm_gem_fence_array_add_implicit v3 [23/27] drm: use new iterator in drm_gem_plane_helper_prepare_fb [24/27] drm/nouveau: use the new iterator in nouveau_fence_sync [25/27] drm/nouveau: use the new interator in nv50_wndw_prepare_fb [26/27] drm/etnaviv: use new iterator in etnaviv_gem_describe [27/27] drm/etnaviv: replace dma_resv_get_excl_unlocked

Message ID

20210924153113.2159-13-christian.koenig@amd.com (mailing list archive)

State

New, archived

Headers

From: " =?utf-8?q?Christian_K=C3=B6nig?= "  <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: [PATCH 13/27] drm/msm: use new iterator in msm_gem_describe
Date: Fri, 24 Sep 2021 17:30:59 +0200
Message-Id: <20210924153113.2159-13-christian.koenig@amd.com>
In-Reply-To: <20210924153113.2159-1-christian.koenig@amd.com>
References: <20210924153113.2159-1-christian.koenig@amd.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

[01/27] dma-buf: add dma_resv_for_each_fence_unlocked v6 | expand

Commit Message

Christian König Sept. 24, 2021, 3:30 p.m. UTC

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);
 }

[13/27] drm/msm: use new iterator in msm_gem_describe

Commit Message

Patch