[14/27] drm/radeon: use new iterator in radeon_sync_resv

Message ID	20210924153113.2159-14-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 14/27] drm/radeon: use new iterator in radeon_sync_resv Date: Fri, 24 Sep 2021 17:31:00 +0200 Message-Id: <20210924153113.2159-14-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-14-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 14/27] drm/radeon: use new iterator in radeon_sync_resv
Date: Fri, 24 Sep 2021 17:31:00 +0200
Message-Id: <20210924153113.2159-14-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:31 p.m. UTC

Simplifying the code a bit.

Signed-off-by: Christian König <christian.koenig@amd.com>
---
 drivers/gpu/drm/radeon/radeon_sync.c | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/drivers/gpu/drm/radeon/radeon_sync.c b/drivers/gpu/drm/radeon/radeon_sync.c
index 9257b60144c4..b991ba1bcd51 100644
--- a/drivers/gpu/drm/radeon/radeon_sync.c
+++ b/drivers/gpu/drm/radeon/radeon_sync.c
@@ -91,33 +91,17 @@  int radeon_sync_resv(struct radeon_device *rdev,
 		     struct dma_resv *resv,
 		     bool shared)
 {
-	struct dma_resv_list *flist;
-	struct dma_fence *f;
+	struct dma_resv_iter cursor;
 	struct radeon_fence *fence;
-	unsigned i;
+	struct dma_fence *f;
 	int r = 0;
 
-	/* always sync to the exclusive fence */
-	f = dma_resv_excl_fence(resv);
-	fence = f ? to_radeon_fence(f) : NULL;
-	if (fence && fence->rdev == rdev)
-		radeon_sync_fence(sync, fence);
-	else if (f)
-		r = dma_fence_wait(f, true);
-
-	flist = dma_resv_shared_list(resv);
-	if (shared || !flist || r)
-		return r;
-
-	for (i = 0; i < flist->shared_count; ++i) {
-		f = rcu_dereference_protected(flist->shared[i],
-					      dma_resv_held(resv));
+	dma_resv_for_each_fence(&cursor, resv, shared, f) {
 		fence = to_radeon_fence(f);
 		if (fence && fence->rdev == rdev)
 			radeon_sync_fence(sync, fence);
 		else
 			r = dma_fence_wait(f, true);
-
 		if (r)
 			break;
 	}

[14/27] drm/radeon: use new iterator in radeon_sync_resv

Commit Message

Patch