From: "Christian König" <ckoenig.leichtzumerken@gmail.com>
To: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] [PATCH 10/25] drm/amdgpu: use new iterator in amdgpu_vm_prt_fini
Date: Thu, 23 Sep 2021 09:55:53 +0200 [thread overview]
Message-ID: <20210923075608.2873-10-christian.koenig@amd.com> (raw)
In-Reply-To: <20210923075608.2873-1-christian.koenig@amd.com>
No need to actually allocate an array of fences here.
Signed-off-by: Christian König <christian.koenig@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 26 +++++---------------------
1 file changed, 5 insertions(+), 21 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index 6b15cad78de9..e42dd79ed6f4 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -2090,30 +2090,14 @@ static void amdgpu_vm_free_mapping(struct amdgpu_device *adev,
static void amdgpu_vm_prt_fini(struct amdgpu_device *adev, struct amdgpu_vm *vm)
{
struct dma_resv *resv = vm->root.bo->tbo.base.resv;
- struct dma_fence *excl, **shared;
- unsigned i, shared_count;
- int r;
+ struct dma_resv_iter cursor;
+ struct dma_fence *fence;
- r = dma_resv_get_fences(resv, &excl, &shared_count, &shared);
- if (r) {
- /* Not enough memory to grab the fence list, as last resort
- * block for all the fences to complete.
- */
- dma_resv_wait_timeout(resv, true, false,
- MAX_SCHEDULE_TIMEOUT);
- return;
- }
-
- /* Add a callback for each fence in the reservation object */
- amdgpu_vm_prt_get(adev);
- amdgpu_vm_add_prt_cb(adev, excl);
-
- for (i = 0; i < shared_count; ++i) {
+ dma_resv_for_each_fence(&cursor, resv, true, fence) {
+ /* Add a callback for each fence in the reservation object */
amdgpu_vm_prt_get(adev);
- amdgpu_vm_add_prt_cb(adev, shared[i]);
+ amdgpu_vm_add_prt_cb(adev, fence);
}
-
- kfree(shared);
}
/**
--
2.25.1
next prev parent reply other threads:[~2021-09-23 11:57 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-23 7:55 [Intel-gfx] [PATCH 01/25] dma-buf: add dma_resv_for_each_fence_unlocked v5 Christian König
2021-09-23 7:55 ` [Intel-gfx] [PATCH 02/25] dma-buf: add dma_resv_for_each_fence Christian König
2021-09-23 7:55 ` [Intel-gfx] [PATCH 03/25] dma-buf: use new iterator in dma_resv_copy_fences Christian König
2021-09-23 7:55 ` [Intel-gfx] [PATCH 04/25] dma-buf: use new iterator in dma_resv_get_fences v3 Christian König
2021-09-23 7:55 ` [Intel-gfx] [PATCH 05/25] dma-buf: use new iterator in dma_resv_wait_timeout Christian König
2021-09-23 7:55 ` [Intel-gfx] [PATCH 06/25] dma-buf: use new iterator in dma_resv_test_signaled Christian König
2021-09-23 7:55 ` [Intel-gfx] [PATCH 07/25] drm/ttm: use the new iterator in ttm_bo_flush_all_fences Christian König
2021-09-23 7:55 ` [Intel-gfx] [PATCH 08/25] drm/amdgpu: use the new iterator in amdgpu_sync_resv Christian König
2021-09-23 7:55 ` [Intel-gfx] [PATCH 09/25] drm/amdgpu: use new iterator in amdgpu_ttm_bo_eviction_valuable Christian König
2021-09-23 7:55 ` Christian König [this message]
2021-09-23 7:55 ` [Intel-gfx] [PATCH 11/25] drm/msm: use new iterator in msm_gem_describe Christian König
2021-09-23 7:55 ` [Intel-gfx] [PATCH 12/25] drm/radeon: use new iterator in radeon_sync_resv Christian König
2021-09-23 7:55 ` [Intel-gfx] [PATCH 13/25] drm/scheduler: use new iterator in drm_sched_job_add_implicit_dependencies v2 Christian König
2021-09-23 7:55 ` [Intel-gfx] [PATCH 14/25] drm/i915: use the new iterator in i915_gem_busy_ioctl v2 Christian König
2021-09-24 9:08 ` Tvrtko Ursulin
2021-09-23 7:55 ` [Intel-gfx] [PATCH 15/25] drm/i915: use the new iterator in i915_sw_fence_await_reservation v3 Christian König
2021-09-23 7:55 ` [Intel-gfx] [PATCH 16/25] drm/i915: use the new iterator in i915_request_await_object v2 Christian König
2021-09-23 7:56 ` [Intel-gfx] [PATCH 17/25] drm/i915: use new iterator in i915_gem_object_wait_reservation Christian König
2021-09-23 7:56 ` [Intel-gfx] [PATCH 18/25] drm/i915: use new iterator in i915_gem_object_wait_priority Christian König
2021-09-23 7:56 ` [Intel-gfx] [PATCH 19/25] drm/i915: use new cursor in intel_prepare_plane_fb Christian König
2021-09-23 7:56 ` [Intel-gfx] [PATCH 20/25] drm: use new iterator in drm_gem_fence_array_add_implicit v3 Christian König
2021-09-23 7:56 ` [Intel-gfx] [PATCH 21/25] drm: use new iterator in drm_gem_plane_helper_prepare_fb Christian König
2021-09-23 7:56 ` [Intel-gfx] [PATCH 22/25] drm/nouveau: use the new iterator in nouveau_fence_sync Christian König
2021-09-23 7:56 ` [Intel-gfx] [PATCH 23/25] drm/nouveau: use the new interator in nv50_wndw_prepare_fb Christian König
2021-09-23 7:56 ` [Intel-gfx] [PATCH 24/25] drm/etnaviv: use new iterator in etnaviv_gem_describe Christian König
2021-09-23 7:56 ` [Intel-gfx] [PATCH 25/25] drm/etnaviv: replace dma_resv_get_excl_unlocked Christian König
2021-09-23 12:32 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [01/25] dma-buf: add dma_resv_for_each_fence_unlocked v5 Patchwork
2021-09-23 12:35 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2021-09-23 13:05 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
2021-09-24 9:11 ` Tvrtko Ursulin
2021-09-24 9:13 ` Christian König
2021-09-24 10:08 ` 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=20210923075608.2873-10-christian.koenig@amd.com \
--to=ckoenig.leichtzumerken@gmail.com \
--cc=intel-gfx@lists.freedesktop.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).