From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
To: "Christian König" <ckoenig.leichtzumerken@gmail.com>,
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: Re: [Intel-gfx] [PATCH 13/26] drm/i915: use the new iterator in i915_gem_busy_ioctl
Date: Wed, 22 Sep 2021 11:21:32 +0100 [thread overview]
Message-ID: <6b22cb75-6c41-db55-83f2-3eae87b585aa@linux.intel.com> (raw)
In-Reply-To: <20210922091044.2612-14-christian.koenig@amd.com>
On 22/09/2021 10:10, Christian König wrote:
> This makes the function much simpler since the complex
> retry logic is now handled else where.
>
> Signed-off-by: Christian König <christian.koenig@amd.com>
> ---
> drivers/gpu/drm/i915/gem/i915_gem_busy.c | 35 ++++++++++--------------
> 1 file changed, 14 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_busy.c b/drivers/gpu/drm/i915/gem/i915_gem_busy.c
> index 6234e17259c1..313afb4a11c7 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_busy.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_busy.c
> @@ -82,8 +82,8 @@ i915_gem_busy_ioctl(struct drm_device *dev, void *data,
> {
> struct drm_i915_gem_busy *args = data;
> struct drm_i915_gem_object *obj;
> - struct dma_resv_list *list;
> - unsigned int seq;
> + struct dma_resv_iter cursor;
> + struct dma_fence *fence;
> int err;
>
> err = -ENOENT;
> @@ -109,27 +109,20 @@ i915_gem_busy_ioctl(struct drm_device *dev, void *data,
> * to report the overall busyness. This is what the wait-ioctl does.
> *
> */
> -retry:
> - seq = raw_read_seqcount(&obj->base.resv->seq);
> -
> - /* Translate the exclusive fence to the READ *and* WRITE engine */
> - args->busy = busy_check_writer(dma_resv_excl_fence(obj->base.resv));
> -
> - /* Translate shared fences to READ set of engines */
> - list = dma_resv_shared_list(obj->base.resv);
> - if (list) {
> - unsigned int shared_count = list->shared_count, i;
> -
> - for (i = 0; i < shared_count; ++i) {
> - struct dma_fence *fence =
> - rcu_dereference(list->shared[i]);
> -
> + args->busy = false;
You can drop this line, especially since it is not a boolean. With that:
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Regards,
Tvrtko
> + dma_resv_iter_begin(&cursor, obj->base.resv, true);
> + dma_resv_for_each_fence_unlocked(&cursor, fence) {
> + if (dma_resv_iter_is_restarted(&cursor))
> + args->busy = 0;
> +
> + if (dma_resv_iter_is_exclusive(&cursor))
> + /* Translate the exclusive fence to the READ *and* WRITE engine */
> + args->busy |= busy_check_writer(fence);
> + else
> + /* Translate shared fences to READ set of engines */
> args->busy |= busy_check_reader(fence);
> - }
> }
> -
> - if (args->busy && read_seqcount_retry(&obj->base.resv->seq, seq))
> - goto retry;
> + dma_resv_iter_end(&cursor);
>
> err = 0;
> out:
>
next prev parent reply other threads:[~2021-09-22 10:21 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-22 9:10 [Intel-gfx] Deploying new iterator interface for dma-buf Christian König
2021-09-22 9:10 ` [Intel-gfx] [PATCH 01/26] dma-buf: add dma_resv_for_each_fence_unlocked v4 Christian König
2021-09-22 14:36 ` Tvrtko Ursulin
2021-09-22 14:50 ` Christian König
2021-09-22 15:09 ` Tvrtko Ursulin
2021-09-22 9:10 ` [Intel-gfx] [PATCH 02/26] dma-buf: add dma_resv_for_each_fence Christian König
2021-09-22 9:10 ` [Intel-gfx] [PATCH 03/26] dma-buf: use new iterator in dma_resv_copy_fences Christian König
2021-09-22 9:10 ` [Intel-gfx] [PATCH 04/26] dma-buf: use new iterator in dma_resv_get_fences v2 Christian König
2021-09-22 9:10 ` [Intel-gfx] [PATCH 05/26] dma-buf: use new iterator in dma_resv_wait_timeout Christian König
2021-09-22 9:10 ` [Intel-gfx] [PATCH 06/26] dma-buf: use new iterator in dma_resv_test_signaled Christian König
2021-09-22 9:10 ` [Intel-gfx] [PATCH 07/26] drm/ttm: use the new iterator in ttm_bo_flush_all_fences Christian König
2021-09-22 9:10 ` [Intel-gfx] [PATCH 08/26] drm/amdgpu: use the new iterator in amdgpu_sync_resv Christian König
2021-09-22 9:10 ` [Intel-gfx] [PATCH 09/26] drm/amdgpu: use new iterator in amdgpu_ttm_bo_eviction_valuable Christian König
2021-09-22 9:10 ` [Intel-gfx] [PATCH 10/26] drm/msm: use new iterator in msm_gem_describe Christian König
2021-09-22 9:10 ` [Intel-gfx] [PATCH 11/26] drm/radeon: use new iterator in radeon_sync_resv Christian König
2021-09-22 9:10 ` [Intel-gfx] [PATCH 12/26] drm/scheduler: use new iterator in drm_sched_job_add_implicit_dependencies v2 Christian König
2021-09-22 9:10 ` [Intel-gfx] [PATCH 13/26] drm/i915: use the new iterator in i915_gem_busy_ioctl Christian König
2021-09-22 10:21 ` Tvrtko Ursulin [this message]
2021-09-22 11:46 ` Tvrtko Ursulin
2021-09-22 12:15 ` Christian König
2021-09-22 12:20 ` Tvrtko Ursulin
2021-09-22 12:22 ` Christian König
2021-09-22 14:31 ` Christian König
2021-09-22 14:39 ` Tvrtko Ursulin
2021-09-22 9:10 ` [Intel-gfx] [PATCH 14/26] drm/i915: use the new iterator in i915_sw_fence_await_reservation v3 Christian König
2021-09-22 9:10 ` [Intel-gfx] [PATCH 15/26] drm/i915: use the new iterator in i915_request_await_object v2 Christian König
2021-09-22 10:34 ` Tvrtko Ursulin
2021-09-22 9:10 ` [Intel-gfx] [PATCH 16/26] drm/i915: use new iterator in i915_gem_object_wait_reservation Christian König
2021-09-22 9:10 ` [Intel-gfx] [PATCH 17/26] drm/i915: use new iterator in i915_gem_object_wait_priority Christian König
2021-09-22 9:10 ` [Intel-gfx] [PATCH 18/26] drm/i915: use new iterator in i915_gem_object_last_write_engine Christian König
2021-09-22 10:27 ` Tvrtko Ursulin
2021-09-22 11:00 ` Christian König
2021-09-22 11:12 ` Tvrtko Ursulin
2021-09-22 9:10 ` [Intel-gfx] [PATCH 19/26] drm/i915: use new cursor in intel_prepare_plane_fb Christian König
2021-09-22 9:10 ` [Intel-gfx] [PATCH 20/26] drm: use new iterator in drm_gem_fence_array_add_implicit v3 Christian König
2021-09-22 9:10 ` [Intel-gfx] [PATCH 21/26] drm: use new iterator in drm_gem_plane_helper_prepare_fb Christian König
2021-09-22 9:10 ` [Intel-gfx] [PATCH 22/26] drm/nouveau: use the new iterator in nouveau_fence_sync Christian König
2021-09-22 9:10 ` [Intel-gfx] [PATCH 23/26] drm/nouveau: use the new interator in nv50_wndw_prepare_fb Christian König
2021-09-22 9:10 ` [Intel-gfx] [PATCH 24/26] drm/etnaviv: use new iterator in etnaviv_gem_describe Christian König
2021-09-22 9:10 ` [Intel-gfx] [PATCH 25/26] drm/etnaviv: replace dma_resv_get_excl_unlocked Christian König
2021-09-22 9:10 ` [Intel-gfx] [PATCH 26/26] dma-buf: nuke dma_resv_get_excl_unlocked Christian König
2021-09-22 12:55 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for series starting with [01/26] dma-buf: add dma_resv_for_each_fence_unlocked v4 Patchwork
-- strict thread matches above, loose matches on Subject: below --
2021-09-21 17:36 [Intel-gfx] [PATCH 01/26] dma-buf: add dma_resv_for_each_fence_unlocked v3 Christian König
2021-09-21 17:36 ` [Intel-gfx] [PATCH 13/26] drm/i915: use the new iterator in i915_gem_busy_ioctl Christian König
2021-09-17 12:34 [Intel-gfx] Deploying new iterator interface for dma-buf Christian König
2021-09-17 12:35 ` [Intel-gfx] [PATCH 13/26] drm/i915: use the new iterator in i915_gem_busy_ioctl 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-16 11:30 [Intel-gfx] Deploying new iterator interface for dma-buf Christian König
2021-09-16 11:30 ` [Intel-gfx] [PATCH 13/26] drm/i915: use the new iterator in i915_gem_busy_ioctl Christian König
2021-09-13 13:16 [Intel-gfx] Deploying new iterator interface for dma-buf Christian König
2021-09-13 13:16 ` [Intel-gfx] [PATCH 13/26] drm/i915: use the new iterator in i915_gem_busy_ioctl Christian König
2021-09-14 13:18 ` Tvrtko Ursulin
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=6b22cb75-6c41-db55-83f2-3eae87b585aa@linux.intel.com \
--to=tvrtko.ursulin@linux.intel.com \
--cc=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 \
/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