drm/xe: unlock on error path in xe_vm_add_compute_exec_queue()

Drop the "&vm->lock" before returning.

Fixes: 24f947d58fe5 ("drm/xe: Use DRM GPUVM helpers for external- and evicted objects")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
(cherry picked from commit cf46019e8550a810cc023af7aa020ba43103b44d)
Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>

diff --git a/drivers/gpu/drm/xe/xe_vm.c b/drivers/gpu/drm/xe/xe_vm.c
index b0e3cab6a5845bd57b53aa27d44599dc25168cb3..10b6995fbf294690a36234dc3c36bf741245b7a9 100644 (file)
--- a/drivers/gpu/drm/xe/xe_vm.c
+++ b/drivers/gpu/drm/xe/xe_vm.c
@@ -335,13 +335,13 @@ int xe_vm_add_compute_exec_queue(struct xe_vm *vm, struct xe_exec_queue *q)
        down_write(&vm->lock);
        err = drm_gpuvm_exec_lock(&vm_exec);
        if (err)
-               return err;
+               goto out_up_write;
 
        pfence = xe_preempt_fence_create(q, q->compute.context,
                                         ++q->compute.seqno);
        if (!pfence) {
                err = -ENOMEM;
-               goto out_unlock;
+               goto out_fini;
        }
 
        list_add(&q->compute.link, &vm->preempt.exec_queues);
@@ -364,8 +364,9 @@ int xe_vm_add_compute_exec_queue(struct xe_vm *vm, struct xe_exec_queue *q)
 
        up_read(&vm->userptr.notifier_lock);
 
-out_unlock:
+out_fini:
        drm_exec_fini(exec);
+out_up_write:
        up_write(&vm->lock);
 
        return err;