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 Subject: [PATCH 22/26] drm/nouveau: use the new iterator in nouveau_fence_sync Date: Fri, 17 Sep 2021 14:35:09 +0200 [thread overview] Message-ID: <20210917123513.1106-23-christian.koenig@amd.com> (raw) In-Reply-To: <20210917123513.1106-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
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 Subject: [Intel-gfx] [PATCH 22/26] drm/nouveau: use the new iterator in nouveau_fence_sync Date: Fri, 17 Sep 2021 14:35:09 +0200 [thread overview] Message-ID: <20210917123513.1106-23-christian.koenig@amd.com> (raw) In-Reply-To: <20210917123513.1106-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
next prev parent reply other threads:[~2021-09-17 12:35 UTC|newest] Thread overview: 118+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-09-17 12:34 Deploying new iterator interface for dma-buf Christian König 2021-09-17 12:34 ` [Intel-gfx] " Christian König 2021-09-17 12:34 ` [PATCH 01/26] dma-buf: add dma_resv_for_each_fence_unlocked v2 Christian König 2021-09-17 12:34 ` [Intel-gfx] " Christian König 2021-09-17 13:23 ` Daniel Vetter 2021-09-17 13:23 ` [Intel-gfx] " Daniel Vetter 2021-09-20 8:43 ` Tvrtko Ursulin 2021-09-20 10:09 ` Christian König 2021-09-20 10:26 ` Tvrtko Ursulin 2021-09-17 12:34 ` [PATCH 02/26] dma-buf: add dma_resv_for_each_fence Christian König 2021-09-17 12:34 ` [Intel-gfx] " Christian König 2021-09-17 13:27 ` Daniel Vetter 2021-09-17 13:27 ` [Intel-gfx] " Daniel Vetter 2021-09-17 14:30 ` Daniel Vetter 2021-09-17 14:30 ` Daniel Vetter 2021-09-17 12:34 ` [PATCH 03/26] dma-buf: use new iterator in dma_resv_copy_fences Christian König 2021-09-17 12:34 ` [Intel-gfx] " Christian König 2021-09-17 14:35 ` Daniel Vetter 2021-09-17 14:35 ` [Intel-gfx] " Daniel Vetter 2021-09-20 7:23 ` Christian König 2021-09-20 7:23 ` [Intel-gfx] " Christian König 2021-09-17 12:34 ` [PATCH 04/26] dma-buf: use new iterator in dma_resv_get_fences v2 Christian König 2021-09-17 12:34 ` [Intel-gfx] " Christian König 2021-09-17 14:39 ` Daniel Vetter 2021-09-17 14:39 ` [Intel-gfx] " Daniel Vetter 2021-09-17 12:34 ` [PATCH 05/26] dma-buf: use new iterator in dma_resv_wait_timeout Christian König 2021-09-17 12:34 ` [Intel-gfx] " Christian König 2021-09-17 14:43 ` Daniel Vetter 2021-09-17 14:43 ` [Intel-gfx] " Daniel Vetter 2021-09-20 7:27 ` Christian König 2021-09-20 7:27 ` [Intel-gfx] " Christian König 2021-09-17 12:34 ` [PATCH 06/26] dma-buf: use new iterator in dma_resv_test_signaled Christian König 2021-09-17 12:34 ` [Intel-gfx] " Christian König 2021-09-17 14:45 ` Daniel Vetter 2021-09-17 14:45 ` [Intel-gfx] " Daniel Vetter 2021-09-17 12:34 ` [PATCH 07/26] drm/ttm: use the new iterator in ttm_bo_flush_all_fences Christian König 2021-09-17 12:34 ` [Intel-gfx] " Christian König 2021-09-17 14:50 ` Daniel Vetter 2021-09-17 14:50 ` [Intel-gfx] " Daniel Vetter 2021-09-17 12:34 ` [PATCH 08/26] drm/amdgpu: use the new iterator in amdgpu_sync_resv Christian König 2021-09-17 12:34 ` [Intel-gfx] " Christian König 2021-09-17 12:34 ` [PATCH 09/26] drm/amdgpu: use new iterator in amdgpu_ttm_bo_eviction_valuable Christian König 2021-09-17 12:34 ` [Intel-gfx] " Christian König 2021-09-17 12:34 ` [PATCH 10/26] drm/msm: use new iterator in msm_gem_describe Christian König 2021-09-17 12:34 ` [Intel-gfx] " Christian König 2021-09-17 12:34 ` [PATCH 11/26] drm/radeon: use new iterator in radeon_sync_resv Christian König 2021-09-17 12:34 ` [Intel-gfx] " Christian König 2021-09-17 12:34 ` [PATCH 12/26] drm/scheduler: use new iterator in drm_sched_job_add_implicit_dependencies v2 Christian König 2021-09-17 12:34 ` [Intel-gfx] " Christian König 2021-09-17 14:52 ` Daniel Vetter 2021-09-17 14:52 ` [Intel-gfx] " Daniel Vetter 2021-11-15 14:03 ` Sascha Hauer 2021-11-15 14:03 ` Sascha Hauer 2021-11-15 14:03 ` [Intel-gfx] " Sascha Hauer 2021-11-15 14:08 ` Daniel Vetter 2021-11-15 14:08 ` [Intel-gfx] " Daniel Vetter 2021-11-15 14:08 ` Daniel Vetter 2021-11-15 20:32 ` Christian König 2021-11-15 20:32 ` Christian König 2021-11-15 20:32 ` [Intel-gfx] " Christian König 2021-11-16 7:56 ` Sascha Hauer 2021-11-16 7:56 ` [Intel-gfx] " Sascha Hauer 2021-11-16 7:56 ` Sascha Hauer 2021-09-17 12:35 ` [PATCH 13/26] drm/i915: use the new iterator in i915_gem_busy_ioctl Christian König 2021-09-17 12:35 ` [Intel-gfx] " Christian König 2021-09-20 8:45 ` Tvrtko Ursulin 2021-09-20 10:13 ` Christian König 2021-09-20 10:33 ` Tvrtko Ursulin 2021-09-21 9:41 ` Christian König 2021-09-21 13:10 ` Tvrtko Ursulin 2021-09-17 12:35 ` [PATCH 14/26] drm/i915: use the new iterator in i915_sw_fence_await_reservation v3 Christian König 2021-09-17 12:35 ` [Intel-gfx] " Christian König 2021-09-20 8:45 ` Tvrtko Ursulin 2021-09-20 8:47 ` Tvrtko Ursulin 2021-09-20 10:14 ` Christian König 2021-09-17 12:35 ` [PATCH 15/26] drm/i915: use the new iterator in i915_request_await_object v2 Christian König 2021-09-17 12:35 ` [Intel-gfx] " Christian König 2021-09-17 12:35 ` [PATCH 16/26] drm/i915: use new iterator in i915_gem_object_wait_reservation v2 Christian König 2021-09-17 12:35 ` [Intel-gfx] " Christian König 2021-09-20 10:00 ` Tvrtko Ursulin 2021-09-21 17:35 ` Christian König 2021-09-17 12:35 ` [PATCH 17/26] drm/i915: use new iterator in i915_gem_object_wait_priority v2 Christian König 2021-09-17 12:35 ` [Intel-gfx] " Christian König 2021-09-17 12:35 ` [PATCH 18/26] drm/i915: use new iterator in i915_gem_object_last_write_engine v2 Christian König 2021-09-17 12:35 ` [Intel-gfx] " Christian König 2021-09-17 12:35 ` [PATCH 19/26] drm/i915: use new cursor in intel_prepare_plane_fb v2 Christian König 2021-09-17 12:35 ` [Intel-gfx] " Christian König 2021-09-17 12:35 ` [PATCH 20/26] drm: use new iterator in drm_gem_fence_array_add_implicit v2 Christian König 2021-09-17 12:35 ` [Intel-gfx] " Christian König 2021-09-17 14:53 ` Daniel Vetter 2021-09-17 14:53 ` [Intel-gfx] " Daniel Vetter 2021-09-20 7:31 ` Christian König 2021-09-20 7:31 ` [Intel-gfx] " Christian König 2021-09-17 12:35 ` [PATCH 21/26] drm: use new iterator in drm_gem_plane_helper_prepare_fb v2 Christian König 2021-09-17 12:35 ` [Intel-gfx] " Christian König 2021-09-17 14:55 ` Daniel Vetter 2021-09-17 14:55 ` [Intel-gfx] " Daniel Vetter 2021-09-20 7:35 ` Christian König 2021-09-20 7:35 ` [Intel-gfx] " Christian König 2021-09-17 12:35 ` Christian König [this message] 2021-09-17 12:35 ` [Intel-gfx] [PATCH 22/26] drm/nouveau: use the new iterator in nouveau_fence_sync Christian König 2021-09-17 12:35 ` [PATCH 23/26] drm/nouveau: use the new interator in nv50_wndw_prepare_fb v2 Christian König 2021-09-17 12:35 ` [Intel-gfx] " Christian König 2021-09-17 12:35 ` [PATCH 24/26] drm/etnaviv: use new iterator in etnaviv_gem_describe Christian König 2021-09-17 12:35 ` [Intel-gfx] " Christian König 2021-09-17 12:35 ` [PATCH 25/26] drm/etnaviv: replace dma_resv_get_excl_unlocked Christian König 2021-09-17 12:35 ` [Intel-gfx] " Christian König 2021-09-17 12:35 ` [PATCH 26/26] dma-buf: nuke dma_resv_get_excl_unlocked Christian König 2021-09-17 12:35 ` [Intel-gfx] " Christian König 2021-09-17 14:56 ` Daniel Vetter 2021-09-17 14:56 ` [Intel-gfx] " Daniel Vetter 2021-09-17 14:01 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [01/26] dma-buf: add dma_resv_for_each_fence_unlocked v2 Patchwork 2021-09-17 14:29 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2021-09-17 15:43 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork -- strict thread matches above, loose matches on Subject: below -- 2021-09-22 9:10 Deploying new iterator interface for dma-buf Christian König 2021-09-22 9:10 ` [PATCH 22/26] drm/nouveau: use the new iterator in nouveau_fence_sync Christian König 2021-09-21 17:36 [PATCH 01/26] dma-buf: add dma_resv_for_each_fence_unlocked v3 Christian König 2021-09-21 17:36 ` [PATCH 22/26] drm/nouveau: use the new iterator in nouveau_fence_sync Christian König 2021-09-16 11:30 Deploying new iterator interface for dma-buf Christian König 2021-09-16 11:30 ` [PATCH 22/26] drm/nouveau: use the new iterator in nouveau_fence_sync Christian König 2021-09-13 13:16 Deploying new iterator interface for dma-buf Christian König 2021-09-13 13:17 ` [PATCH 22/26] drm/nouveau: use the new iterator in nouveau_fence_sync Christian König
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=20210917123513.1106-23-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 \ --subject='Re: [PATCH 22/26] drm/nouveau: use the new iterator in nouveau_fence_sync' \ /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
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.