]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/xe/vm: Use xe_vm_lock()/xe_vm_unlock() helpers
authorHimal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>
Wed, 24 Apr 2024 04:39:09 +0000 (10:09 +0530)
committerMatthew Brost <matthew.brost@intel.com>
Fri, 26 Apr 2024 03:38:34 +0000 (20:38 -0700)
There is no change in functionality. Using the helper function
defined within the driver.

-v2
Use xe_vm_unlock() (Ashutosh/Matt)

-v3
Use xe_vm_unlock() for error label too (Matt)

Reviewed-by: Badal Nilawar <badal.nilawar@intel.com>
Cc: Matthew Brost <matthew.brost@intel.com>
Cc: Ashutosh Dixit <ashutosh.dixit@intel.com>
Signed-off-by: Himal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240424043910.2190376-2-himal.prasad.ghimiray@intel.com
drivers/gpu/drm/xe/xe_vm.c

index dc685bf458574d139cc0084b3f8d57a725f2db99..c506432420c5e9e9588798eb76185f1473a19a4c 100644 (file)
@@ -1278,7 +1278,7 @@ struct xe_vm *xe_vm_create(struct xe_device *xe, u32 flags)
 
        drm_gem_object_put(vm_resv_obj);
 
-       err = dma_resv_lock_interruptible(xe_vm_resv(vm), NULL);
+       err = xe_vm_lock(vm, true);
        if (err)
                goto err_close;
 
@@ -1322,7 +1322,7 @@ struct xe_vm *xe_vm_create(struct xe_device *xe, u32 flags)
 
                xe_pt_populate_empty(tile, vm, vm->pt_root[id]);
        }
-       dma_resv_unlock(xe_vm_resv(vm));
+       xe_vm_unlock(vm);
 
        /* Kernel migration VM shouldn't have a circular loop.. */
        if (!(flags & XE_VM_FLAG_MIGRATION)) {
@@ -1364,7 +1364,7 @@ struct xe_vm *xe_vm_create(struct xe_device *xe, u32 flags)
        return vm;
 
 err_unlock_close:
-       dma_resv_unlock(xe_vm_resv(vm));
+       xe_vm_unlock(vm);
 err_close:
        xe_vm_close_and_put(vm);
        return ERR_PTR(err);