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 15/26] drm/i915: use the new iterator in i915_request_await_object v2
Date: Wed, 22 Sep 2021 11:34:58 +0100 [thread overview]
Message-ID: <0af21739-f397-096b-d4fa-e51840603c6f@linux.intel.com> (raw)
In-Reply-To: <20210922091044.2612-16-christian.koenig@amd.com>
On 22/09/2021 10:10, Christian König wrote:
> Simplifying the code a bit.
>
> v2: add missing rcu_read_lock()/rcu_read_unlock()
> v3: use dma_resv_for_each_fence instead
>
> Signed-off-by: Christian König <christian.koenig@amd.com>
> ---
> drivers/gpu/drm/i915/i915_request.c | 34 +++++------------------------
> 1 file changed, 5 insertions(+), 29 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_request.c b/drivers/gpu/drm/i915/i915_request.c
> index ce446716d092..3839712ebd23 100644
> --- a/drivers/gpu/drm/i915/i915_request.c
> +++ b/drivers/gpu/drm/i915/i915_request.c
> @@ -1509,38 +1509,14 @@ i915_request_await_object(struct i915_request *to,
> struct drm_i915_gem_object *obj,
> bool write)
> {
> - struct dma_fence *excl;
> + struct dma_resv_iter cursor;
> + struct dma_fence *fence;
> int ret = 0;
>
> - if (write) {
> - struct dma_fence **shared;
> - unsigned int count, i;
> -
> - ret = dma_resv_get_fences(obj->base.resv, &excl, &count,
> - &shared);
> + dma_resv_for_each_fence(&cursor, obj->base.resv, write, fence) {
> + ret = i915_request_await_dma_fence(to, fence);
> if (ret)
> - return ret;
> -
> - for (i = 0; i < count; i++) {
> - ret = i915_request_await_dma_fence(to, shared[i]);
> - if (ret)
> - break;
> -
> - dma_fence_put(shared[i]);
> - }
> -
> - for (; i < count; i++)
> - dma_fence_put(shared[i]);
> - kfree(shared);
> - } else {
> - excl = dma_resv_get_excl_unlocked(obj->base.resv);
> - }
> -
> - if (excl) {
> - if (ret == 0)
> - ret = i915_request_await_dma_fence(to, excl);
> -
> - dma_fence_put(excl);
> + break;
> }
>
> return ret;
>
Short and sweet. I hope CI confirms all callers have it locked and in
the meantime I will risk it:
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Regards,
Tvrtko
next prev parent reply other threads:[~2021-09-22 10:35 UTC|newest]
Thread overview: 45+ 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
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 [this message]
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 15/26] drm/i915: use the new iterator in i915_request_await_object v2 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 15/26] drm/i915: use the new iterator in i915_request_await_object v2 Christian König
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 15/26] drm/i915: use the new iterator in i915_request_await_object v2 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=0af21739-f397-096b-d4fa-e51840603c6f@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