All of lore.kernel.org
 help / color / mirror / Atom feed
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: [PATCH 25/28] drm/nouveau: use the new iterator in nouveau_fence_sync
Date: Fri,  1 Oct 2021 12:06:07 +0200	[thread overview]
Message-ID: <20211001100610.2899-26-christian.koenig@amd.com> (raw)
In-Reply-To: <20211001100610.2899-1-christian.koenig@amd.com>

Simplifying the code a bit.

Signed-off-by: Christian König <christian.koenig@amd.com>
---
 drivers/gpu/drm/nouveau/nouveau_fence.c | 48 +++++++------------------
 1 file changed, 12 insertions(+), 36 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c b/drivers/gpu/drm/nouveau/nouveau_fence.c
index 05d0b3eb3690..26f9299df881 100644
--- a/drivers/gpu/drm/nouveau/nouveau_fence.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fence.c
@@ -339,14 +339,15 @@ nouveau_fence_wait(struct nouveau_fence *fence, bool lazy, bool intr)
 }
 
 int
-nouveau_fence_sync(struct nouveau_bo *nvbo, struct nouveau_channel *chan, bool exclusive, bool intr)
+nouveau_fence_sync(struct nouveau_bo *nvbo, struct nouveau_channel *chan,
+		   bool exclusive, bool intr)
 {
 	struct nouveau_fence_chan *fctx = chan->fence;
-	struct dma_fence *fence;
 	struct dma_resv *resv = nvbo->bo.base.resv;
-	struct dma_resv_list *fobj;
+	struct dma_resv_iter cursor;
+	struct dma_fence *fence;
 	struct nouveau_fence *f;
-	int ret = 0, i;
+	int ret;
 
 	if (!exclusive) {
 		ret = dma_resv_reserve_shared(resv, 1);
@@ -355,10 +356,7 @@ nouveau_fence_sync(struct nouveau_bo *nvbo, struct nouveau_channel *chan, bool e
 			return ret;
 	}
 
-	fobj = dma_resv_shared_list(resv);
-	fence = dma_resv_excl_fence(resv);
-
-	if (fence) {
+	dma_resv_for_each_fence(&cursor, resv, exclusive, fence) {
 		struct nouveau_channel *prev = NULL;
 		bool must_wait = true;
 
@@ -366,41 +364,19 @@ nouveau_fence_sync(struct nouveau_bo *nvbo, struct nouveau_channel *chan, bool e
 		if (f) {
 			rcu_read_lock();
 			prev = rcu_dereference(f->channel);
-			if (prev && (prev == chan || fctx->sync(f, prev, chan) == 0))
+			if (prev && (prev == chan ||
+				     fctx->sync(f, prev, chan) == 0))
 				must_wait = false;
 			rcu_read_unlock();
 		}
 
-		if (must_wait)
+		if (must_wait) {
 			ret = dma_fence_wait(fence, intr);
-
-		return ret;
-	}
-
-	if (!exclusive || !fobj)
-		return ret;
-
-	for (i = 0; i < fobj->shared_count && !ret; ++i) {
-		struct nouveau_channel *prev = NULL;
-		bool must_wait = true;
-
-		fence = rcu_dereference_protected(fobj->shared[i],
-						dma_resv_held(resv));
-
-		f = nouveau_local_fence(fence, chan->drm);
-		if (f) {
-			rcu_read_lock();
-			prev = rcu_dereference(f->channel);
-			if (prev && (prev == chan || fctx->sync(f, prev, chan) == 0))
-				must_wait = false;
-			rcu_read_unlock();
+			if (ret)
+				return ret;
 		}
-
-		if (must_wait)
-			ret = dma_fence_wait(fence, intr);
 	}
-
-	return ret;
+	return 0;
 }
 
 void
-- 
2.25.1


WARNING: multiple messages have this Message-ID (diff)
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 25/28] drm/nouveau: use the new iterator in nouveau_fence_sync
Date: Fri,  1 Oct 2021 12:06:07 +0200	[thread overview]
Message-ID: <20211001100610.2899-26-christian.koenig@amd.com> (raw)
In-Reply-To: <20211001100610.2899-1-christian.koenig@amd.com>

Simplifying the code a bit.

Signed-off-by: Christian König <christian.koenig@amd.com>
---
 drivers/gpu/drm/nouveau/nouveau_fence.c | 48 +++++++------------------
 1 file changed, 12 insertions(+), 36 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c b/drivers/gpu/drm/nouveau/nouveau_fence.c
index 05d0b3eb3690..26f9299df881 100644
--- a/drivers/gpu/drm/nouveau/nouveau_fence.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fence.c
@@ -339,14 +339,15 @@ nouveau_fence_wait(struct nouveau_fence *fence, bool lazy, bool intr)
 }
 
 int
-nouveau_fence_sync(struct nouveau_bo *nvbo, struct nouveau_channel *chan, bool exclusive, bool intr)
+nouveau_fence_sync(struct nouveau_bo *nvbo, struct nouveau_channel *chan,
+		   bool exclusive, bool intr)
 {
 	struct nouveau_fence_chan *fctx = chan->fence;
-	struct dma_fence *fence;
 	struct dma_resv *resv = nvbo->bo.base.resv;
-	struct dma_resv_list *fobj;
+	struct dma_resv_iter cursor;
+	struct dma_fence *fence;
 	struct nouveau_fence *f;
-	int ret = 0, i;
+	int ret;
 
 	if (!exclusive) {
 		ret = dma_resv_reserve_shared(resv, 1);
@@ -355,10 +356,7 @@ nouveau_fence_sync(struct nouveau_bo *nvbo, struct nouveau_channel *chan, bool e
 			return ret;
 	}
 
-	fobj = dma_resv_shared_list(resv);
-	fence = dma_resv_excl_fence(resv);
-
-	if (fence) {
+	dma_resv_for_each_fence(&cursor, resv, exclusive, fence) {
 		struct nouveau_channel *prev = NULL;
 		bool must_wait = true;
 
@@ -366,41 +364,19 @@ nouveau_fence_sync(struct nouveau_bo *nvbo, struct nouveau_channel *chan, bool e
 		if (f) {
 			rcu_read_lock();
 			prev = rcu_dereference(f->channel);
-			if (prev && (prev == chan || fctx->sync(f, prev, chan) == 0))
+			if (prev && (prev == chan ||
+				     fctx->sync(f, prev, chan) == 0))
 				must_wait = false;
 			rcu_read_unlock();
 		}
 
-		if (must_wait)
+		if (must_wait) {
 			ret = dma_fence_wait(fence, intr);
-
-		return ret;
-	}
-
-	if (!exclusive || !fobj)
-		return ret;
-
-	for (i = 0; i < fobj->shared_count && !ret; ++i) {
-		struct nouveau_channel *prev = NULL;
-		bool must_wait = true;
-
-		fence = rcu_dereference_protected(fobj->shared[i],
-						dma_resv_held(resv));
-
-		f = nouveau_local_fence(fence, chan->drm);
-		if (f) {
-			rcu_read_lock();
-			prev = rcu_dereference(f->channel);
-			if (prev && (prev == chan || fctx->sync(f, prev, chan) == 0))
-				must_wait = false;
-			rcu_read_unlock();
+			if (ret)
+				return ret;
 		}
-
-		if (must_wait)
-			ret = dma_fence_wait(fence, intr);
 	}
-
-	return ret;
+	return 0;
 }
 
 void
-- 
2.25.1


  parent reply	other threads:[~2021-10-01 10:06 UTC|newest]

Thread overview: 101+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-01 10:05 Deploying new iterator interface for dma-buf Christian König
2021-10-01 10:05 ` [Intel-gfx] " Christian König
2021-10-01 10:05 ` [PATCH 01/28] dma-buf: add dma_resv_for_each_fence_unlocked v7 Christian König
2021-10-01 10:05   ` [Intel-gfx] " Christian König
2021-10-04  9:29   ` Tvrtko Ursulin
2021-10-04  9:29     ` [Intel-gfx] " Tvrtko Ursulin
2021-10-04  9:53     ` Christian König
2021-10-04  9:53       ` [Intel-gfx] " Christian König
2021-10-04 10:34       ` Tvrtko Ursulin
2021-10-04 10:34         ` [Intel-gfx] " Tvrtko Ursulin
2021-10-04 10:44         ` Christian König
2021-10-04 10:44           ` [Intel-gfx] " Christian König
2021-10-04 10:50           ` Tvrtko Ursulin
2021-10-04 10:50             ` [Intel-gfx] " Tvrtko Ursulin
2021-10-04 12:59             ` Christian König
2021-10-04 12:59               ` [Intel-gfx] " Christian König
2021-10-04 13:15               ` Tvrtko Ursulin
2021-10-04 13:15                 ` [Intel-gfx] " Tvrtko Ursulin
2021-10-01 10:05 ` [PATCH 02/28] dma-buf: add dma_resv_for_each_fence Christian König
2021-10-01 10:05   ` [Intel-gfx] " Christian König
2021-10-01 10:05 ` [PATCH 03/28] dma-buf: add dma_resv selftest Christian König
2021-10-01 10:05   ` [Intel-gfx] " Christian König
2021-10-04 13:11   ` Tvrtko Ursulin
2021-10-04 13:11     ` [Intel-gfx] " Tvrtko Ursulin
2021-10-01 10:05 ` [PATCH 04/28] dma-buf: use new iterator in dma_resv_copy_fences Christian König
2021-10-01 10:05   ` [Intel-gfx] " Christian König
2021-10-01 10:05 ` [PATCH 05/28] dma-buf: use new iterator in dma_resv_get_fences v3 Christian König
2021-10-01 10:05   ` [Intel-gfx] " Christian König
2021-10-01 10:05 ` [PATCH 06/28] dma-buf: use new iterator in dma_resv_wait_timeout Christian König
2021-10-01 10:05   ` [Intel-gfx] " Christian König
2021-10-01 10:05 ` [PATCH 07/28] dma-buf: use new iterator in dma_resv_test_signaled Christian König
2021-10-01 10:05   ` [Intel-gfx] " Christian König
2021-10-01 10:05 ` [PATCH 08/28] dma-buf: use the new iterator in dma_buf_debug_show Christian König
2021-10-01 10:05   ` [Intel-gfx] " Christian König
2021-10-05  7:35   ` Tvrtko Ursulin
2021-10-05  7:35     ` [Intel-gfx] " Tvrtko Ursulin
2021-10-01 10:05 ` [PATCH 09/28] dma-buf: use the new iterator in dma_resv_poll Christian König
2021-10-01 10:05   ` [Intel-gfx] " Christian König
2021-10-05  7:44   ` Tvrtko Ursulin
2021-10-05  7:44     ` [Intel-gfx] " Tvrtko Ursulin
2021-10-05  8:16     ` Christian König
2021-10-05  8:16       ` [Intel-gfx] " Christian König
2021-10-05  8:41       ` Tvrtko Ursulin
2021-10-05  8:41         ` [Intel-gfx] " Tvrtko Ursulin
2021-10-01 10:05 ` [PATCH 10/28] drm/ttm: use the new iterator in ttm_bo_flush_all_fences Christian König
2021-10-01 10:05   ` [Intel-gfx] " Christian König
2021-10-01 10:05 ` [PATCH 11/28] drm/amdgpu: use the new iterator in amdgpu_sync_resv Christian König
2021-10-01 10:05   ` [Intel-gfx] " Christian König
2021-10-01 10:05 ` [PATCH 12/28] drm/amdgpu: use new iterator in amdgpu_ttm_bo_eviction_valuable Christian König
2021-10-01 10:05   ` [Intel-gfx] " Christian König
2021-10-01 10:05 ` [PATCH 13/28] drm/amdgpu: use new iterator in amdgpu_vm_prt_fini Christian König
2021-10-01 10:05   ` [Intel-gfx] " Christian König
2021-10-01 10:05 ` [PATCH 14/28] drm/msm: use new iterator in msm_gem_describe Christian König
2021-10-01 10:05   ` [Intel-gfx] " Christian König
2021-10-01 10:05 ` [PATCH 15/28] drm/radeon: use new iterator in radeon_sync_resv Christian König
2021-10-01 10:05   ` [Intel-gfx] " Christian König
2021-10-01 10:05 ` [PATCH 16/28] drm/scheduler: use new iterator in drm_sched_job_add_implicit_dependencies v2 Christian König
2021-10-01 10:05   ` [Intel-gfx] " Christian König
2021-10-01 10:05 ` [PATCH 17/28] drm/i915: use the new iterator in i915_gem_busy_ioctl v2 Christian König
2021-10-01 10:05   ` [Intel-gfx] " Christian König
2021-10-01 10:37   ` Tvrtko Ursulin
2021-10-01 10:37     ` [Intel-gfx] " Tvrtko Ursulin
2021-10-01 10:39     ` Christian König
2021-10-01 10:39       ` [Intel-gfx] " Christian König
2021-10-01 10:06 ` [PATCH 18/28] drm/i915: use the new iterator in i915_sw_fence_await_reservation v3 Christian König
2021-10-01 10:06   ` [Intel-gfx] " Christian König
2021-10-01 10:06 ` [PATCH 19/28] drm/i915: use the new iterator in i915_request_await_object v2 Christian König
2021-10-01 10:06   ` [Intel-gfx] " Christian König
2021-10-01 10:06 ` [PATCH 20/28] drm/i915: use new iterator in i915_gem_object_wait_reservation Christian König
2021-10-01 10:06   ` [Intel-gfx] " Christian König
2021-10-01 10:06 ` [PATCH 21/28] drm/i915: use new iterator in i915_gem_object_wait_priority Christian König
2021-10-01 10:06   ` [Intel-gfx] " Christian König
2021-10-01 10:06 ` [PATCH 22/28] drm/i915: use new cursor in intel_prepare_plane_fb Christian König
2021-10-01 10:06   ` [Intel-gfx] " Christian König
2021-10-01 10:06 ` [PATCH 23/28] drm: use new iterator in drm_gem_fence_array_add_implicit v3 Christian König
2021-10-01 10:06   ` [Intel-gfx] " Christian König
2021-10-05  7:48   ` Tvrtko Ursulin
2021-10-05  7:48     ` [Intel-gfx] " Tvrtko Ursulin
2021-10-01 10:06 ` [PATCH 24/28] drm: use new iterator in drm_gem_plane_helper_prepare_fb Christian König
2021-10-01 10:06   ` [Intel-gfx] " Christian König
2021-10-05  7:53   ` Tvrtko Ursulin
2021-10-05  7:53     ` [Intel-gfx] " Tvrtko Ursulin
2021-10-05 10:27     ` Christian König
2021-10-05 10:27       ` [Intel-gfx] " Christian König
2021-10-05 10:47       ` Tvrtko Ursulin
2021-10-05 10:47         ` [Intel-gfx] " Tvrtko Ursulin
2021-10-05 11:23         ` Christian König
2021-10-05 11:23           ` [Intel-gfx] " Christian König
2021-10-01 10:06 ` Christian König [this message]
2021-10-01 10:06   ` [Intel-gfx] [PATCH 25/28] drm/nouveau: use the new iterator in nouveau_fence_sync Christian König
2021-10-01 10:06 ` [PATCH 26/28] drm/nouveau: use the new interator in nv50_wndw_prepare_fb Christian König
2021-10-01 10:06   ` [Intel-gfx] " Christian König
2021-10-01 10:06 ` [PATCH 27/28] drm/etnaviv: use new iterator in etnaviv_gem_describe Christian König
2021-10-01 10:06   ` [Intel-gfx] " Christian König
2021-10-01 10:06 ` [PATCH 28/28] drm/etnaviv: replace dma_resv_get_excl_unlocked Christian König
2021-10-01 10:06   ` [Intel-gfx] " Christian König
2021-10-01 17:59 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [01/28] dma-buf: add dma_resv_for_each_fence_unlocked v7 Patchwork
2021-10-01 18:01 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2021-10-01 18:33 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
2021-10-05 11:37 Deploying new iterator interface for dma-buf Christian König
2021-10-05 11:37 ` [PATCH 25/28] drm/nouveau: use the new iterator in nouveau_fence_sync Christian König
2021-10-13 14:27   ` 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=20211001100610.2899-26-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.