From: "Christian König" <ckoenig.leichtzumerken@gmail.com> To: daniel.vetter@ffwll.ch, dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org, intel-gfx@lists.freedesktop.org Cc: "Christian König" <christian.koenig@amd.com> Subject: [PATCH 10/15] drm/amdgpu: use DMA_RESV_USAGE_BOOKKEEP Date: Thu, 7 Apr 2022 10:59:41 +0200 [thread overview] Message-ID: <20220407085946.744568-11-christian.koenig@amd.com> (raw) In-Reply-To: <20220407085946.744568-1-christian.koenig@amd.com> Use DMA_RESV_USAGE_BOOKKEEP for VM page table updates and KFD preemption fence. Signed-off-by: Christian König <christian.koenig@amd.com> --- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c index 5031e26e6716..808e21dcb517 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c @@ -263,7 +263,7 @@ static int amdgpu_amdkfd_remove_eviction_fence(struct amdgpu_bo *bo, */ replacement = dma_fence_get_stub(); dma_resv_replace_fences(bo->tbo.base.resv, ef->base.context, - replacement, DMA_RESV_USAGE_READ); + replacement, DMA_RESV_USAGE_BOOKKEEP); dma_fence_put(replacement); return 0; } diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c index dbb551762805..9485b541947e 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c @@ -112,7 +112,8 @@ static int amdgpu_vm_sdma_commit(struct amdgpu_vm_update_params *p, swap(p->vm->last_unlocked, f); dma_fence_put(tmp); } else { - amdgpu_bo_fence(p->vm->root.bo, f, true); + dma_resv_add_fence(p->vm->root.bo->tbo.base.resv, f, + DMA_RESV_USAGE_BOOKKEEP); } if (fence && !p->immediate) -- 2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: "Christian König" <ckoenig.leichtzumerken@gmail.com> To: daniel.vetter@ffwll.ch, dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org, intel-gfx@lists.freedesktop.org Cc: "Christian König" <christian.koenig@amd.com> Subject: [Intel-gfx] [PATCH 10/15] drm/amdgpu: use DMA_RESV_USAGE_BOOKKEEP Date: Thu, 7 Apr 2022 10:59:41 +0200 [thread overview] Message-ID: <20220407085946.744568-11-christian.koenig@amd.com> (raw) In-Reply-To: <20220407085946.744568-1-christian.koenig@amd.com> Use DMA_RESV_USAGE_BOOKKEEP for VM page table updates and KFD preemption fence. Signed-off-by: Christian König <christian.koenig@amd.com> --- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c index 5031e26e6716..808e21dcb517 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c @@ -263,7 +263,7 @@ static int amdgpu_amdkfd_remove_eviction_fence(struct amdgpu_bo *bo, */ replacement = dma_fence_get_stub(); dma_resv_replace_fences(bo->tbo.base.resv, ef->base.context, - replacement, DMA_RESV_USAGE_READ); + replacement, DMA_RESV_USAGE_BOOKKEEP); dma_fence_put(replacement); return 0; } diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c index dbb551762805..9485b541947e 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c @@ -112,7 +112,8 @@ static int amdgpu_vm_sdma_commit(struct amdgpu_vm_update_params *p, swap(p->vm->last_unlocked, f); dma_fence_put(tmp); } else { - amdgpu_bo_fence(p->vm->root.bo, f, true); + dma_resv_add_fence(p->vm->root.bo->tbo.base.resv, f, + DMA_RESV_USAGE_BOOKKEEP); } if (fence && !p->immediate) -- 2.25.1
next prev parent reply other threads:[~2022-04-07 9:00 UTC|newest] Thread overview: 95+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-04-07 8:59 DMA-resv usage Christian König 2022-04-07 8:59 ` [Intel-gfx] " Christian König 2022-04-07 8:59 ` [PATCH 01/15] dma-buf: add enum dma_resv_usage v4 Christian König 2022-04-07 8:59 ` [Intel-gfx] " Christian König 2022-04-07 8:59 ` [PATCH 02/15] dma-buf: specify usage while adding fences to dma_resv obj v7 Christian König 2022-04-07 8:59 ` [Intel-gfx] " Christian König 2022-04-07 9:14 ` Daniel Vetter 2022-04-07 9:14 ` [Intel-gfx] " Daniel Vetter 2022-04-07 9:14 ` Daniel Vetter 2022-04-07 13:08 ` Javier Martinez Canillas 2022-04-07 13:08 ` [Intel-gfx] " Javier Martinez Canillas 2022-04-07 13:13 ` Christian König 2022-04-07 13:13 ` [Intel-gfx] " Christian König 2022-04-07 13:16 ` Javier Martinez Canillas 2022-04-07 13:16 ` [Intel-gfx] " Javier Martinez Canillas 2022-04-07 8:59 ` [PATCH 03/15] dma-buf & drm/amdgpu: remove dma_resv workaround Christian König 2022-04-07 8:59 ` [Intel-gfx] " Christian König 2022-04-20 3:56 ` Zack Rusin 2022-04-20 3:56 ` [Intel-gfx] " Zack Rusin 2022-04-20 3:56 ` Zack Rusin 2022-04-20 7:37 ` Christian König 2022-04-20 7:37 ` [Intel-gfx] " Christian König 2022-04-20 17:38 ` Zack Rusin 2022-04-20 17:38 ` [Intel-gfx] " Zack Rusin 2022-04-20 17:40 ` Christian König 2022-04-20 17:40 ` [Intel-gfx] " Christian König 2022-04-20 18:41 ` Zack Rusin 2022-04-20 18:41 ` [Intel-gfx] " Zack Rusin 2022-04-20 18:49 ` Christian König 2022-04-20 18:49 ` [Intel-gfx] " Christian König 2022-04-20 18:56 ` Christian König 2022-04-20 18:56 ` [Intel-gfx] " Christian König 2022-04-20 19:28 ` Zack Rusin 2022-04-20 19:28 ` [Intel-gfx] " Zack Rusin 2022-04-21 10:17 ` Christian König 2022-04-21 10:17 ` [Intel-gfx] " Christian König 2022-04-21 21:13 ` Zack Rusin 2022-04-21 21:13 ` [Intel-gfx] " Zack Rusin 2022-04-22 7:47 ` Christian König 2022-04-22 7:47 ` [Intel-gfx] " Christian König 2022-04-07 8:59 ` [PATCH 04/15] dma-buf: add DMA_RESV_USAGE_KERNEL v3 Christian König 2022-04-07 8:59 ` [Intel-gfx] " Christian König 2022-04-07 8:59 ` [PATCH 05/15] drm/amdgpu: use DMA_RESV_USAGE_KERNEL Christian König 2022-04-07 8:59 ` [Intel-gfx] " Christian König 2022-04-07 8:59 ` [PATCH 06/15] drm/radeon: " Christian König 2022-04-07 8:59 ` [Intel-gfx] " Christian König 2022-04-07 8:59 ` [PATCH 07/15] drm/nouveau: only wait for kernel fences in nouveau_bo_vm_cleanup Christian König 2022-04-07 8:59 ` [Intel-gfx] " Christian König 2022-04-07 8:59 ` [PATCH 08/15] RDMA: use DMA_RESV_USAGE_KERNEL Christian König 2022-04-07 8:59 ` [Intel-gfx] " Christian König 2022-04-07 8:59 ` [PATCH 09/15] dma-buf: add DMA_RESV_USAGE_BOOKKEEP v3 Christian König 2022-04-07 8:59 ` [Intel-gfx] " Christian König 2022-04-07 8:59 ` Christian König [this message] 2022-04-07 8:59 ` [Intel-gfx] [PATCH 10/15] drm/amdgpu: use DMA_RESV_USAGE_BOOKKEEP Christian König 2022-04-07 8:59 ` [PATCH 11/15] dma-buf: wait for map to complete for static attachments Christian König 2022-04-07 8:59 ` [Intel-gfx] " Christian König 2022-04-07 8:59 ` [PATCH 12/15] drm/i915: drop bo->moving dependency Christian König 2022-04-07 8:59 ` [Intel-gfx] " Christian König 2022-04-08 9:05 ` Jani Nikula 2022-04-08 9:05 ` [Intel-gfx] " Jani Nikula 2022-04-08 9:05 ` Jani Nikula 2022-04-08 9:27 ` Christian König 2022-04-08 9:27 ` [Intel-gfx] " Christian König 2022-04-08 9:27 ` Christian König 2022-04-08 9:33 ` Daniel Vetter 2022-04-08 9:33 ` Daniel Vetter 2022-04-08 9:33 ` [Intel-gfx] " Daniel Vetter 2022-04-08 9:39 ` Christian König 2022-04-08 9:39 ` [Intel-gfx] " Christian König 2022-04-08 9:39 ` Christian König 2022-04-08 10:15 ` Jani Nikula 2022-04-08 10:15 ` Jani Nikula 2022-04-08 10:15 ` [Intel-gfx] " Jani Nikula 2022-04-08 10:41 ` Christian König 2022-04-08 10:41 ` [Intel-gfx] " Christian König 2022-04-08 10:41 ` Christian König 2022-04-07 8:59 ` [PATCH 13/15] drm/ttm: remove bo->moving Christian König 2022-04-07 8:59 ` [Intel-gfx] " Christian König 2022-04-07 8:59 ` [PATCH 14/15] dma-buf: drop seq count based update Christian König 2022-04-07 8:59 ` [Intel-gfx] " Christian König 2022-04-07 8:59 ` [PATCH 15/15] seqlock: drop seqcount_ww_mutex_t Christian König 2022-04-07 8:59 ` [Intel-gfx] " Christian König 2022-04-07 8:59 ` Christian König 2022-04-07 9:19 ` Daniel Vetter 2022-04-07 9:19 ` [Intel-gfx] " Daniel Vetter 2022-04-07 9:19 ` Daniel Vetter 2022-04-07 11:48 ` Christian König 2022-04-07 11:48 ` [Intel-gfx] " Christian König 2022-04-07 9:26 ` Peter Zijlstra 2022-04-07 9:26 ` [Intel-gfx] " Peter Zijlstra 2022-04-07 9:26 ` Peter Zijlstra 2022-04-07 9:15 ` DMA-resv usage Daniel Vetter 2022-04-07 9:15 ` [Intel-gfx] " Daniel Vetter 2022-04-07 9:15 ` Daniel Vetter 2022-04-25 13:05 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for series starting with [01/15] dma-buf: add enum dma_resv_usage v4 (rev2) Patchwork
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=20220407085946.744568-11-christian.koenig@amd.com \ --to=ckoenig.leichtzumerken@gmail.com \ --cc=christian.koenig@amd.com \ --cc=daniel.vetter@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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.