drm/xe: Use xe_bo_lock()/xe_bo_unlock() helpers

There is no change in functionality. Using the helper function
defined within the driver for locking/unlocking the reservation
object.

Cc: Matthew Brost <matthew.brost@intel.com>
Cc: Ashutosh Dixit <ashutosh.dixit@intel.com>
Suggested-by: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
Signed-off-by: Himal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240424043910.2190376-3-himal.prasad.ghimiray@intel.com

diff --git a/drivers/gpu/drm/xe/xe_lrc.c b/drivers/gpu/drm/xe/xe_lrc.c
index 615bbc372ac629293a39b1a82011e93e599f04a1..2066d34ddf0be282d4e4d247d08b1c65113b2cb2 100644 (file)
--- a/drivers/gpu/drm/xe/xe_lrc.c
+++ b/drivers/gpu/drm/xe/xe_lrc.c
@@ -1382,7 +1382,7 @@ void xe_lrc_snapshot_capture_delayed(struct xe_lrc_snapshot *snapshot)
        if (!snapshot->lrc_snapshot)
                goto put_bo;
 
-       dma_resv_lock(bo->ttm.base.resv, NULL);
+       xe_bo_lock(bo, false);
        if (!ttm_bo_vmap(&bo->ttm, &src)) {
                xe_map_memcpy_from(xe_bo_device(bo),
                                   snapshot->lrc_snapshot, &src, snapshot->lrc_offset,
@@ -1392,7 +1392,7 @@ void xe_lrc_snapshot_capture_delayed(struct xe_lrc_snapshot *snapshot)
                kvfree(snapshot->lrc_snapshot);
                snapshot->lrc_snapshot = NULL;
        }
-       dma_resv_unlock(bo->ttm.base.resv);
+       xe_bo_unlock(bo);
 put_bo:
        xe_bo_put(bo);
 }

diff --git a/drivers/gpu/drm/xe/xe_vm.c b/drivers/gpu/drm/xe/xe_vm.c
index c506432420c5e9e9588798eb76185f1473a19a4c..89c73d109f6a398c8e226e53c935480ba915037f 100644 (file)
--- a/drivers/gpu/drm/xe/xe_vm.c
+++ b/drivers/gpu/drm/xe/xe_vm.c
@@ -3352,7 +3352,7 @@ void xe_vm_snapshot_capture_delayed(struct xe_vm_snapshot *snap)
                }
 
                if (bo) {
-                       dma_resv_lock(bo->ttm.base.resv, NULL);
+                       xe_bo_lock(bo, false);
                        err = ttm_bo_vmap(&bo->ttm, &src);
                        if (!err) {
                                xe_map_memcpy_from(xe_bo_device(bo),
@@ -3361,7 +3361,7 @@ void xe_vm_snapshot_capture_delayed(struct xe_vm_snapshot *snap)
                                                   snap->snap[i].len);
                                ttm_bo_vunmap(&bo->ttm, &src);
                        }
-                       dma_resv_unlock(bo->ttm.base.resv);
+                       xe_bo_unlock(bo);
                } else {
                        void __user *userptr = (void __user *)(size_t)snap->snap[i].bo_ofs;