[PATCH v4 23/25] drm/xe: Enter ULLS for migration jobs upon page fault or SVM prefetch

[Matthew Brost <matthew.brost@intel.com>]

Call xe_migration_ulls_enter upon page fault or SVM prefetch in an
effort speed up these critical paths.

Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Link: https://patch.msgid.link/20260228013501.106680-25-matthew.brost@intel.com
Signed-off-by: Maarten Lankhorst <dev@lankhorst.se>
---
 drivers/gpu/drm/xe/xe_migrate.c   | 4 ++--
 drivers/gpu/drm/xe/xe_pagefault.c | 3 +++
 drivers/gpu/drm/xe/xe_vm.c        | 4 +++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_migrate.c b/drivers/gpu/drm/xe/xe_migrate.c
index 1fa236eb1a26..80efa67fc2e1 100644
--- a/drivers/gpu/drm/xe/xe_migrate.c
+++ b/drivers/gpu/drm/xe/xe_migrate.c
@@ -114,8 +114,8 @@ static void xe_migrate_fini(void *arg)
 	disable_delayed_work_sync(&m->ulls.exit_work);
 	mutex_lock(&m->job_mutex);
 	if (m->ulls.enabled) {
-		xe_force_wake_put(gt_to_fw(m->q->hwe->gt), m->q->hwe->domain);
 		xe_pm_runtime_put(xe);
+		xe_force_wake_put(gt_to_fw(m->q->hwe->gt), m->q->hwe->domain);
 		m->ulls.enabled = false;
 	}
 	mutex_unlock(&m->job_mutex);
@@ -589,8 +589,8 @@ static void xe_migrate_ulls_exit(struct work_struct *work)
 		xe_sched_job_put(job);
 	if (!m->ulls.enabled) {
 		/* Pairs with PM gets on enter */
-		xe_force_wake_put(gt_to_fw(m->q->hwe->gt), m->q->hwe->domain);
 		xe_pm_runtime_put(xe);
+		xe_force_wake_put(gt_to_fw(m->q->hwe->gt), m->q->hwe->domain);
 
 		cancel_delayed_work(&m->ulls.exit_work);
 		xe_dbg(xe, "Migrate ULLS mode exit");
diff --git a/drivers/gpu/drm/xe/xe_pagefault.c b/drivers/gpu/drm/xe/xe_pagefault.c
index e81ca24df37f..ecf2530f0284 100644
--- a/drivers/gpu/drm/xe/xe_pagefault.c
+++ b/drivers/gpu/drm/xe/xe_pagefault.c
@@ -15,6 +15,7 @@
 #include "xe_gt_stats.h"
 #include "xe_hw_engine.h"
 #include "xe_log.h"
+#include "xe_migrate.h"
 #include "xe_pagefault.h"
 #include "xe_pagefault_types.h"
 #include "xe_svm.h"
@@ -262,6 +263,8 @@ static int xe_pagefault_service(struct xe_pagefault *pf)
 	if (IS_ERR(vm))
 		return PTR_ERR(vm);
 
+	xe_migrate_ulls_enter(gt_to_tile(gt)->migrate);
+
 	down_read(&vm->lock);
 
 	if (xe_vm_is_closed(vm)) {
diff --git a/drivers/gpu/drm/xe/xe_vm.c b/drivers/gpu/drm/xe/xe_vm.c
index 0e6ec05de551..25425b57ceaa 100644
--- a/drivers/gpu/drm/xe/xe_vm.c
+++ b/drivers/gpu/drm/xe/xe_vm.c
@@ -2526,8 +2526,10 @@ vm_bind_ioctl_ops_create(struct xe_vm *vm, struct xe_vma_ops *vops,
 			ctx.devmem_possible = IS_DGFX(vm->xe) &&
 					      IS_ENABLED(CONFIG_DRM_XE_PAGEMAP);
 
-			for_each_tile(tile, vm->xe, id)
+			for_each_tile(tile, vm->xe, id) {
+				xe_migrate_ulls_enter(tile->migrate);
 				tile_mask |= 0x1 << id;
+			}
 
 			if (prefetch_region == DRM_XE_CONSULT_MEM_ADVISE_PREF_LOC) {
 				dpagemap = xe_vma_resolve_pagemap(vma,
-- 
2.34.1