]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
drm/xe: remove unmatched xe_vm_unlock() from __xe_exec_queue_init()
authorMaciej Patelczyk <maciej.patelczyk@intel.com>
Fri, 30 May 2025 13:56:27 +0000 (15:56 +0200)
committerThomas Hellström <thomas.hellstrom@linux.intel.com>
Thu, 5 Jun 2025 16:55:46 +0000 (18:55 +0200)
There is unmatched xe_vm_unlock() in the __xe_exec_queue_init().
Leftover from commit fbeaad071a98 ("drm/xe: Create LRC BO without VM")

Fixes: 2b0a0ce0c20b ("drm/xe: Create LRC BO without VM")
Signed-off-by: Maciej Patelczyk <maciej.patelczyk@intel.com>
Reviewed-by: Jonathan Cavitt <jonathan.cavitt@intel.com>
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
Signed-off-by: Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>
Link: https://lore.kernel.org/r/20250530135627.2821612-1-maciej.patelczyk@intel.com
(cherry picked from commit 28b996ce73982a44fa86736ca0e3684cb1ae8b24)
Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
drivers/gpu/drm/xe/xe_exec_queue.c

index 338487dc74c083d3c3dfb51a5a96397fb0828973..0161a80e92bc0756f4665f33ad3dde34f3bf3977 100644 (file)
@@ -114,7 +114,6 @@ static struct xe_exec_queue *__xe_exec_queue_alloc(struct xe_device *xe,
 
 static int __xe_exec_queue_init(struct xe_exec_queue *q)
 {
-       struct xe_vm *vm = q->vm;
        int i, err;
        u32 flags = 0;
 
@@ -136,7 +135,7 @@ static int __xe_exec_queue_init(struct xe_exec_queue *q)
                q->lrc[i] = xe_lrc_create(q->hwe, q->vm, SZ_16K, q->msix_vec, flags);
                if (IS_ERR(q->lrc[i])) {
                        err = PTR_ERR(q->lrc[i]);
-                       goto err_unlock;
+                       goto err_lrc;
                }
        }
 
@@ -146,9 +145,6 @@ static int __xe_exec_queue_init(struct xe_exec_queue *q)
 
        return 0;
 
-err_unlock:
-       if (vm)
-               xe_vm_unlock(vm);
 err_lrc:
        for (i = i - 1; i >= 0; --i)
                xe_lrc_put(q->lrc[i]);