dri-devel.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
From: Felix Kuehling <Felix.Kuehling@amd.com>
To: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Cc: Alex Sierra <alex.sierra@amd.com>
Subject: [PATCH 28/34] drm/amdgpu: add svm_bo eviction to enable_signal cb
Date: Thu,  1 Apr 2021 00:22:22 -0400	[thread overview]
Message-ID: <20210401042228.1423-29-Felix.Kuehling@amd.com> (raw)
In-Reply-To: <20210401042228.1423-1-Felix.Kuehling@amd.com>

From: Alex Sierra <alex.sierra@amd.com>

Add to amdgpu_amdkfd_fence.enable_signal callback, support
for svm_bo fence eviction.

Signed-off-by: Alex Sierra <alex.sierra@amd.com>
Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c
index 53559643c712..1fe233cddb20 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c
@@ -28,6 +28,7 @@
 #include <linux/slab.h>
 #include <linux/sched/mm.h>
 #include "amdgpu_amdkfd.h"
+#include "kfd_svm.h"
 
 static const struct dma_fence_ops amdkfd_fence_ops;
 static atomic_t fence_seq = ATOMIC_INIT(0);
@@ -123,9 +124,13 @@ static bool amdkfd_fence_enable_signaling(struct dma_fence *f)
 	if (dma_fence_is_signaled(f))
 		return true;
 
-	if (!kgd2kfd_schedule_evict_and_restore_process(fence->mm, f))
-		return true;
-
+	if (!fence->svm_bo) {
+		if (!kgd2kfd_schedule_evict_and_restore_process(fence->mm, f))
+			return true;
+	} else {
+		if (!svm_range_schedule_evict_svm_bo(fence))
+			return true;
+	}
 	return false;
 }
 
-- 
2.31.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

  parent reply	other threads:[~2021-04-01  4:23 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-01  4:21 [PATCH 00/34] Add HMM-based SVM memory manager to KFD v3 Felix Kuehling
2021-04-01  4:21 ` [PATCH 01/34] drm/amdkfd: helper to convert gpu id and idx Felix Kuehling
2021-04-01  4:21 ` [PATCH 02/34] drm/amdkfd: add svm ioctl API Felix Kuehling
2021-04-01  4:21 ` [PATCH 03/34] drm/amdkfd: register svm range Felix Kuehling
2021-04-01 10:04   ` kernel test robot
2021-04-01  4:21 ` [PATCH 04/34] drm/amdkfd: add svm ioctl GET_ATTR op Felix Kuehling
2021-04-01  4:21 ` [PATCH 05/34] drm/amdgpu: add common HMM get pages function Felix Kuehling
2021-04-01  4:22 ` [PATCH 06/34] drm/amdkfd: validate svm range system memory Felix Kuehling
2021-04-01  4:22 ` [PATCH 07/34] drm/amdkfd: deregister svm range Felix Kuehling
2021-04-01 11:48   ` kernel test robot
2021-04-01  4:22 ` [PATCH 08/34] drm/amdgpu: export vm update mapping interface Felix Kuehling
2021-04-01  4:22 ` [PATCH 09/34] drm/amdkfd: map svm range to GPUs Felix Kuehling
2021-04-01 13:28   ` kernel test robot
2021-04-01  4:22 ` [PATCH 10/34] drm/amdkfd: svm range eviction and restore Felix Kuehling
2021-04-01 15:19   ` kernel test robot
2021-04-01  4:22 ` [PATCH 11/34] drm/amdgpu: Enable retry faults unconditionally on Aldebaran Felix Kuehling
2021-04-01  4:22 ` [PATCH 12/34] drm/amdkfd: add xnack enabled flag to kfd_process Felix Kuehling
2021-04-01  4:22 ` [PATCH 13/34] drm/amdkfd: add ioctl to configure and query xnack retries Felix Kuehling
2021-04-01  4:22 ` [PATCH 14/34] drm/amdkfd: register HMM device private zone Felix Kuehling
2021-04-01 19:38   ` kernel test robot
2021-04-01  4:22 ` [PATCH 15/34] drm/amdkfd: validate vram svm range from TTM Felix Kuehling
2021-04-01  4:22 ` [PATCH 16/34] drm/amdkfd: support xgmi same hive mapping Felix Kuehling
2021-04-01  4:22 ` [PATCH 17/34] drm/amdkfd: copy memory through gart table Felix Kuehling
2021-04-01  4:22 ` [PATCH 18/34] drm/amdkfd: HMM migrate ram to vram Felix Kuehling
2021-04-01  4:22 ` [PATCH 19/34] drm/amdkfd: HMM migrate vram to ram Felix Kuehling
2021-04-01 22:37   ` kernel test robot
2021-04-01  4:22 ` [PATCH 20/34] drm/amdkfd: invalidate tables on page retry fault Felix Kuehling
2021-04-01  4:22 ` [PATCH 21/34] drm/amdgpu: enable 48-bit IH timestamp counter Felix Kuehling
2021-04-01  4:22 ` [PATCH 22/34] drm/amdkfd: page table restore through svm API Felix Kuehling
2021-04-01  4:22 ` [PATCH 23/34] drm/amdkfd: SVM API call to restore page tables Felix Kuehling
2021-04-01  4:22 ` [PATCH 24/34] drm/amdkfd: add svm_bo reference for eviction fence Felix Kuehling
2021-04-01  4:22 ` [PATCH 25/34] drm/amdgpu: add param bit flag to create SVM BOs Felix Kuehling
2021-04-01  4:22 ` [PATCH 26/34] drm/amdkfd: add svm_bo eviction mechanism support Felix Kuehling
2021-04-01  4:22 ` [PATCH 27/34] drm/amdgpu: svm bo enable_signal call condition Felix Kuehling
2021-04-01  4:22 ` Felix Kuehling [this message]
2021-04-01  4:22 ` [PATCH 29/34] drm/amdgpu: reserve fence slot to update page table Felix Kuehling
2021-04-01  4:22 ` [PATCH 30/34] drm/amdkfd: refine migration policy with xnack on Felix Kuehling
2021-04-01  4:22 ` [PATCH 31/34] drm/amdkfd: add svm range validate timestamp Felix Kuehling
2021-04-01  4:22 ` [PATCH 32/34] drm/amdkfd: multiple gpu migrate vram to vram Felix Kuehling
2021-04-01  4:22 ` [PATCH 33/34] drm/amdkfd: Add SVM API support capability bits Felix Kuehling
2021-04-01  4:22 ` [PATCH 34/34] drm/amdkfd: Add CONFIG_HSA_AMD_SVM Felix Kuehling

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=20210401042228.1423-29-Felix.Kuehling@amd.com \
    --to=felix.kuehling@amd.com \
    --cc=alex.sierra@amd.com \
    --cc=amd-gfx@lists.freedesktop.org \
    --cc=dri-devel@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).