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 14/26] drm/i915: use the new iterator in i915_sw_fence_await_reservation v3
Date: Mon, 20 Sep 2021 09:47:23 +0100 [thread overview]
Message-ID: <60595ff8-7935-c0a4-7c0f-2a4c3a1d62b9@linux.intel.com> (raw)
In-Reply-To: <93b93f00-7ad3-9ea3-e947-77297b4552c9@linux.intel.com>
On 20/09/2021 09:45, Tvrtko Ursulin wrote:
>
> On 17/09/2021 13:35, Christian König wrote:
>> Simplifying the code a bit.
>>
>> v2: use dma_resv_for_each_fence instead, according to Tvrtko the lock is
>> held here anyway.
>> v3: back to using dma_resv_for_each_fence_unlocked.
>
> It did not work out - what happened?
Wait, my suggestion to try the locked iterator was against
i915_request_await_object. I haven't looked at this one at the time or
even now.
Regards,
Tvrtko
> Regards,
>
> Tvrtko
>
>> Signed-off-by: Christian König <christian.koenig@amd.com>
>> ---
>> drivers/gpu/drm/i915/i915_sw_fence.c | 57 ++++++++--------------------
>> 1 file changed, 15 insertions(+), 42 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/i915_sw_fence.c
>> b/drivers/gpu/drm/i915/i915_sw_fence.c
>> index c589a681da77..7635b0478ea5 100644
>> --- a/drivers/gpu/drm/i915/i915_sw_fence.c
>> +++ b/drivers/gpu/drm/i915/i915_sw_fence.c
>> @@ -572,56 +572,29 @@ int i915_sw_fence_await_reservation(struct
>> i915_sw_fence *fence,
>> unsigned long timeout,
>> gfp_t gfp)
>> {
>> - struct dma_fence *excl;
>> + struct dma_resv_iter cursor;
>> + struct dma_fence *f;
>> int ret = 0, pending;
>> debug_fence_assert(fence);
>> might_sleep_if(gfpflags_allow_blocking(gfp));
>> - if (write) {
>> - struct dma_fence **shared;
>> - unsigned int count, i;
>> -
>> - ret = dma_resv_get_fences(resv, &excl, &count, &shared);
>> - if (ret)
>> - return ret;
>> -
>> - for (i = 0; i < count; i++) {
>> - if (shared[i]->ops == exclude)
>> - continue;
>> -
>> - pending = i915_sw_fence_await_dma_fence(fence,
>> - shared[i],
>> - timeout,
>> - gfp);
>> - if (pending < 0) {
>> - ret = pending;
>> - break;
>> - }
>> -
>> - ret |= pending;
>> - }
>> -
>> - for (i = 0; i < count; i++)
>> - dma_fence_put(shared[i]);
>> - kfree(shared);
>> - } else {
>> - excl = dma_resv_get_excl_unlocked(resv);
>> - }
>> -
>> - if (ret >= 0 && excl && excl->ops != exclude) {
>> - pending = i915_sw_fence_await_dma_fence(fence,
>> - excl,
>> - timeout,
>> + rcu_read_lock();
>> + dma_resv_iter_begin(&cursor, resv, write);
>> + dma_resv_for_each_fence_unlocked(&cursor, f) {
>> + rcu_read_unlock();
>> + pending = i915_sw_fence_await_dma_fence(fence, f, timeout,
>> gfp);
>> - if (pending < 0)
>> + rcu_read_lock();
>> + if (pending < 0) {
>> ret = pending;
>> - else
>> - ret |= pending;
>> - }
>> -
>> - dma_fence_put(excl);
>> + break;
>> + }
>> + ret |= pending;
>> + }
>> + dma_resv_iter_end(&cursor);
>> + rcu_read_unlock();
>> return ret;
>> }
>>
next prev parent reply other threads:[~2021-09-20 8:47 UTC|newest]
Thread overview: 60+ 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 ` [PATCH 01/26] dma-buf: add dma_resv_for_each_fence_unlocked v2 Christian König
2021-09-17 13:23 ` Daniel Vetter
2021-09-20 8:43 ` [Intel-gfx] " 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 13:27 ` 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 14:35 ` Daniel Vetter
2021-09-20 7:23 ` 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 14:39 ` 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 14:43 ` Daniel Vetter
2021-09-20 7:27 ` 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 14:45 ` 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 14:50 ` 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 ` [PATCH 09/26] drm/amdgpu: use new iterator in amdgpu_ttm_bo_eviction_valuable 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 ` [PATCH 11/26] drm/radeon: use new iterator in radeon_sync_resv 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 14:52 ` Daniel Vetter
2021-11-15 14:03 ` Sascha Hauer
2021-11-15 14:08 ` Daniel Vetter
2021-11-15 20:32 ` Christian König
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-20 8:45 ` [Intel-gfx] " 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-20 8:45 ` [Intel-gfx] " Tvrtko Ursulin
2021-09-20 8:47 ` Tvrtko Ursulin [this message]
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 ` [PATCH 16/26] drm/i915: use new iterator in i915_gem_object_wait_reservation v2 Christian König
2021-09-20 10:00 ` [Intel-gfx] " 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 ` [PATCH 18/26] drm/i915: use new iterator in i915_gem_object_last_write_engine v2 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 ` [PATCH 20/26] drm: use new iterator in drm_gem_fence_array_add_implicit v2 Christian König
2021-09-17 14:53 ` Daniel Vetter
2021-09-20 7:31 ` 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 14:55 ` Daniel Vetter
2021-09-20 7:35 ` Christian König
2021-09-17 12:35 ` [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 ` [PATCH 24/26] drm/etnaviv: use new iterator in etnaviv_gem_describe 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 ` [PATCH 26/26] dma-buf: nuke dma_resv_get_excl_unlocked Christian König
2021-09-17 14:56 ` 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=60595ff8-7935-c0a4-7c0f-2a4c3a1d62b9@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;
as well as URLs for NNTP newsgroup(s).