Commit 772157f6 authored Jan 20, 2026 by Matthew Auld Committed by Thomas Hellström Jan 21, 2026

drm/xe/migrate: fix job lock assert



We are meant to be checking the user vm for the bind queue, but actually
we are checking the migrate vm. For various reasons this is not
currently firing but this will likely change in the future.

Now that we have the user_vm attached to the bind queue, we can fix this
by directly checking that here.

Fixes: dba89840 ("drm/xe: Add GT TLB invalidation jobs")
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Cc: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: Arvind Yadav <arvind.yadav@intel.com>
Link: https://patch.msgid.link/20260120110609.77958-4-matthew.auld@intel.com


(cherry picked from commit 9dd1048b)
Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>

parent 6f4b7aed

drivers/gpu/drm/xe/xe_migrate.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2445,7 +2445,7 @@ void xe_migrate_job_lock(struct xe_migrate m, struct xe_exec_queue q)
		if (is_migrate)
		mutex_lock(&m->job_mutex);
		else
		xe_vm_assert_held(q->vm); /* User queues VM's should be locked */
		xe_vm_assert_held(q->user_vm); /* User queues VM's should be locked */
		}

		/**
		@@ -2463,7 +2463,7 @@ void xe_migrate_job_unlock(struct xe_migrate m, struct xe_exec_queue q)
		if (is_migrate)
		mutex_unlock(&m->job_mutex);
		else
		xe_vm_assert_held(q->vm); /* User queues VM's should be locked */
		xe_vm_assert_held(q->user_vm); /* User queues VM's should be locked */
		}

		#if IS_ENABLED(CONFIG_PROVE_LOCKING)