Skip to content

Commit 772157f

Browse files
matt-auldThomas Hellström
authored andcommitted
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: dba8984 ("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 9dd1048) Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
1 parent 6f4b7ae commit 772157f

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/gpu/drm/xe/xe_migrate.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2445,7 +2445,7 @@ void xe_migrate_job_lock(struct xe_migrate *m, struct xe_exec_queue *q)
24452445
if (is_migrate)
24462446
mutex_lock(&m->job_mutex);
24472447
else
2448-
xe_vm_assert_held(q->vm); /* User queues VM's should be locked */
2448+
xe_vm_assert_held(q->user_vm); /* User queues VM's should be locked */
24492449
}
24502450

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

24692469
#if IS_ENABLED(CONFIG_PROVE_LOCKING)

0 commit comments

Comments
 (0)