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 19/28] drm/i915: use the new iterator in i915_request_await_object v2
Date: Fri, 1 Oct 2021 12:06:01 +0200 [thread overview]
Message-ID: <20211001100610.2899-20-christian.koenig@amd.com> (raw)
In-Reply-To: <20211001100610.2899-1-christian.koenig@amd.com>
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>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.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;
--
2.25.1
next prev parent reply other threads:[~2021-10-01 12:10 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-01 10:05 [Intel-gfx] Deploying new iterator interface for dma-buf Christian König
2021-10-01 10:05 ` [Intel-gfx] [PATCH 01/28] dma-buf: add dma_resv_for_each_fence_unlocked v7 Christian König
2021-10-04 9:29 ` Tvrtko Ursulin
2021-10-04 9:53 ` Christian König
2021-10-04 10:34 ` Tvrtko Ursulin
2021-10-04 10:44 ` Christian König
2021-10-04 10:50 ` Tvrtko Ursulin
2021-10-04 12:59 ` Christian König
2021-10-04 13:15 ` Tvrtko Ursulin
2021-10-01 10:05 ` [Intel-gfx] [PATCH 02/28] dma-buf: add dma_resv_for_each_fence Christian König
2021-10-01 10:05 ` [Intel-gfx] [PATCH 03/28] dma-buf: add dma_resv selftest Christian König
2021-10-04 13:11 ` Tvrtko Ursulin
2021-10-01 10:05 ` [Intel-gfx] [PATCH 04/28] dma-buf: use new iterator in dma_resv_copy_fences Christian König
2021-10-01 10:05 ` [Intel-gfx] [PATCH 05/28] dma-buf: use new iterator in dma_resv_get_fences v3 Christian König
2021-10-01 10:05 ` [Intel-gfx] [PATCH 06/28] dma-buf: use new iterator in dma_resv_wait_timeout Christian König
2021-10-01 10:05 ` [Intel-gfx] [PATCH 07/28] dma-buf: use new iterator in dma_resv_test_signaled Christian König
2021-10-01 10:05 ` [Intel-gfx] [PATCH 08/28] dma-buf: use the new iterator in dma_buf_debug_show Christian König
2021-10-05 7:35 ` Tvrtko Ursulin
2021-10-01 10:05 ` [Intel-gfx] [PATCH 09/28] dma-buf: use the new iterator in dma_resv_poll Christian König
2021-10-05 7:44 ` Tvrtko Ursulin
2021-10-05 8:16 ` Christian König
2021-10-05 8:41 ` Tvrtko Ursulin
2021-10-01 10:05 ` [Intel-gfx] [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] [PATCH 11/28] drm/amdgpu: use the new iterator in amdgpu_sync_resv Christian König
2021-10-01 10:05 ` [Intel-gfx] [PATCH 12/28] drm/amdgpu: use new iterator in amdgpu_ttm_bo_eviction_valuable Christian König
2021-10-01 10:05 ` [Intel-gfx] [PATCH 13/28] drm/amdgpu: use new iterator in amdgpu_vm_prt_fini Christian König
2021-10-01 10:05 ` [Intel-gfx] [PATCH 14/28] drm/msm: use new iterator in msm_gem_describe Christian König
2021-10-01 10:05 ` [Intel-gfx] [PATCH 15/28] drm/radeon: use new iterator in radeon_sync_resv Christian König
2021-10-01 10:05 ` [Intel-gfx] [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] [PATCH 17/28] drm/i915: use the new iterator in i915_gem_busy_ioctl v2 Christian König
2021-10-01 10:37 ` Tvrtko Ursulin
2021-10-01 10:39 ` Christian König
2021-10-01 10:06 ` [Intel-gfx] [PATCH 18/28] drm/i915: use the new iterator in i915_sw_fence_await_reservation v3 Christian König
2021-10-01 10:06 ` Christian König [this message]
2021-10-01 10:06 ` [Intel-gfx] [PATCH 20/28] drm/i915: use new iterator in i915_gem_object_wait_reservation Christian König
2021-10-01 10:06 ` [Intel-gfx] [PATCH 21/28] drm/i915: use new iterator in i915_gem_object_wait_priority Christian König
2021-10-01 10:06 ` [Intel-gfx] [PATCH 22/28] drm/i915: use new cursor in intel_prepare_plane_fb Christian König
2021-10-01 10:06 ` [Intel-gfx] [PATCH 23/28] drm: use new iterator in drm_gem_fence_array_add_implicit v3 Christian König
2021-10-05 7:48 ` Tvrtko Ursulin
2021-10-01 10:06 ` [Intel-gfx] [PATCH 24/28] drm: use new iterator in drm_gem_plane_helper_prepare_fb Christian König
2021-10-05 7:53 ` Tvrtko Ursulin
2021-10-05 10:27 ` Christian König
2021-10-05 10:47 ` Tvrtko Ursulin
2021-10-05 11:23 ` Christian König
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 ` [Intel-gfx] [PATCH 26/28] drm/nouveau: use the new interator in nv50_wndw_prepare_fb Christian König
2021-10-01 10:06 ` [Intel-gfx] [PATCH 27/28] drm/etnaviv: use new iterator in etnaviv_gem_describe Christian König
2021-10-01 10:06 ` [Intel-gfx] [PATCH 28/28] drm/etnaviv: replace dma_resv_get_excl_unlocked 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 [Intel-gfx] Deploying new iterator interface for dma-buf Christian König
2021-10-05 11:37 ` [Intel-gfx] [PATCH 19/28] 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=20211001100610.2899-20-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 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).