linux-media.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Christian König" <ckoenig.leichtzumerken@gmail.com>
To: daniel@ffwll.ch
Cc: linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org,
	linaro-mm-sig@lists.linaro.org
Subject: [PATCH 21/28] drm/amdgpu: use dma_resv_get_singleton in amdgpu_pasid_free_cb
Date: Mon, 29 Nov 2021 13:06:52 +0100	[thread overview]
Message-ID: <20211129120659.1815-22-christian.koenig@amd.com> (raw)
In-Reply-To: <20211129120659.1815-1-christian.koenig@amd.com>

Makes the code a bit more simpler.

Signed-off-by: Christian König <christian.koenig@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c
index be48487e2ca7..888d97143177 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c
@@ -107,36 +107,19 @@ static void amdgpu_pasid_free_cb(struct dma_fence *fence,
 void amdgpu_pasid_free_delayed(struct dma_resv *resv,
 			       u32 pasid)
 {
-	struct dma_fence *fence, **fences;
 	struct amdgpu_pasid_cb *cb;
-	unsigned count;
+	struct dma_fence *fence;
 	int r;
 
-	r = dma_resv_get_fences(resv, true, &count, &fences);
+	r = dma_resv_get_singleton(resv, true, &fence);
 	if (r)
 		goto fallback;
 
-	if (count == 0) {
+	if (!fence) {
 		amdgpu_pasid_free(pasid);
 		return;
 	}
 
-	if (count == 1) {
-		fence = fences[0];
-		kfree(fences);
-	} else {
-		uint64_t context = dma_fence_context_alloc(1);
-		struct dma_fence_array *array;
-
-		array = dma_fence_array_create(count, fences, context,
-					       1, false);
-		if (!array) {
-			kfree(fences);
-			goto fallback;
-		}
-		fence = &array->base;
-	}
-
 	cb = kmalloc(sizeof(*cb), GFP_KERNEL);
 	if (!cb) {
 		/* Last resort when we are OOM */
-- 
2.25.1


  parent reply	other threads:[~2021-11-29 13:27 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-29 12:06 completely rework the dma_resv semantic Christian König
2021-11-29 12:06 ` [PATCH 01/28] drm/i915: Remove dma_resv_prune Christian König
2021-11-29 12:06 ` [PATCH 02/28] drm/ttm: stop pruning fences after wait Christian König
2021-11-30  9:02   ` Daniel Vetter
2021-11-30  9:53     ` Christian König
2021-11-29 12:06 ` [PATCH 03/28] dma-buf: make fence mandatory for dma_resv_add_excl_fence v2 Christian König
2021-11-30  9:03   ` Daniel Vetter
2021-11-29 12:06 ` [PATCH 04/28] drm/qxl: use iterator instead of dma_resv_shared_list Christian König
2021-11-30  9:06   ` Daniel Vetter
2021-11-29 12:06 ` [PATCH 05/28] dma-buf: add dma_resv_replace_fences Christian König
2021-11-29 12:06 ` [PATCH 06/28] dma-buf: finally make the dma_resv_list private Christian König
2021-11-29 12:06 ` [PATCH 07/28] dma-buf: drop excl_fence parameter from dma_resv_get_fences Christian König
2021-11-29 12:06 ` [PATCH 08/28] dma-buf: add dma_resv_get_singleton v2 Christian König
2021-11-29 12:06 ` [PATCH 09/28] RDMA: use dma_resv_wait() instead of extracting the fence Christian König
2021-11-29 12:06 ` [PATCH 10/28] drm/etnaviv: stop using dma_resv_excl_fence Christian König
2021-11-29 12:06 ` [PATCH 11/28] drm/nouveau: " Christian König
2021-11-29 12:06 ` [PATCH 12/28] drm/vmwgfx: " Christian König
2021-11-29 12:06 ` [PATCH 13/28] drm/radeon: " Christian König
2021-11-29 12:06 ` [PATCH 14/28] drm/amdgpu: remove excl as shared workarounds Christian König
2021-11-29 12:06 ` [PATCH 15/28] drm/amdgpu: use dma_resv_for_each_fence for CS workaround Christian König
2021-11-29 12:06 ` [PATCH 16/28] dma-buf: finally make dma_resv_excl_fence private Christian König
2021-11-29 12:06 ` [PATCH 17/28] dma-buf: drop the DAG approach for the dma_resv object Christian König
2021-11-29 12:06 ` [PATCH 18/28] dma-buf/drivers: make reserving a shared slot mandatory v2 Christian König
2021-11-29 12:06 ` [PATCH 19/28] drm: support more than one write fence in drm_gem_plane_helper_prepare_fb Christian König
2021-11-29 12:06 ` [PATCH 20/28] drm/nouveau: support more than one write fence in fenv50_wndw_prepare_fb Christian König
2021-11-29 12:06 ` Christian König [this message]
2021-11-29 12:06 ` [PATCH 22/28] dma-buf: add enum dma_resv_usage v3 Christian König
2021-11-29 12:06 ` [PATCH 23/28] dma-buf: specify usage while adding fences to dma_resv obj v2 Christian König
2021-11-29 12:06 ` [PATCH 24/28] dma-buf: add DMA_RESV_USAGE_KERNEL Christian König
2021-11-29 12:06 ` [PATCH 25/28] dma-buf: add DMA_RESV_USAGE_BOOKKEEP Christian König
2021-11-29 12:06 ` [PATCH 26/28] dma-buf: wait for map to complete for static attachments Christian König
2021-11-29 12:06 ` [PATCH 27/28] amdgpu: remove DMA-buf fence workaround Christian König
2021-11-29 12:06 ` [PATCH 28/28] drm/ttm: remove bo->moving 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=20211129120659.1815-22-christian.koenig@amd.com \
    --to=ckoenig.leichtzumerken@gmail.com \
    --cc=daniel@ffwll.ch \
    --cc=dri-devel@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).