summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/xe/xe_dma_buf.c
diff options
context:
space:
mode:
authorThomas Hellström <thomas.hellstrom@linux.intel.com>2023-09-08 12:17:13 +0300
committerRodrigo Vivi <rodrigo.vivi@intel.com>2023-12-21 19:41:07 +0300
commitb7ab8c4f028f87b8c79c9f99e12b891fd5430483 (patch)
tree2340366ea28a938b605a20b01c4eac81fead5e29 /drivers/gpu/drm/xe/xe_dma_buf.c
parentd00e9cc28e1e42108618e7a146969a26679170a2 (diff)
downloadlinux-b7ab8c4f028f87b8c79c9f99e12b891fd5430483.tar.xz
drm/xe/bo: Remove the lock_no_vm()/unlock_no_vm() interface
Apart from asserts, it's essentially the same as xe_bo_lock()/xe_bo_unlock(), and the usage intentions of this interface was unclear. Remove it. v2: - Update the xe_display subsystem as well. Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com> Reviewed-by: Matthew Brost <matthew.brost@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20230908091716.36984-4-thomas.hellstrom@linux.intel.com Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'drivers/gpu/drm/xe/xe_dma_buf.c')
-rw-r--r--drivers/gpu/drm/xe/xe_dma_buf.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/xe/xe_dma_buf.c b/drivers/gpu/drm/xe/xe_dma_buf.c
index b9bf4b4dd8a5..8ce1b582402a 100644
--- a/drivers/gpu/drm/xe/xe_dma_buf.c
+++ b/drivers/gpu/drm/xe/xe_dma_buf.c
@@ -150,9 +150,10 @@ static int xe_dma_buf_begin_cpu_access(struct dma_buf *dma_buf,
if (!reads)
return 0;
- xe_bo_lock_no_vm(bo, NULL);
+ /* Can we do interruptible lock here? */
+ xe_bo_lock(bo, false);
(void)xe_bo_migrate(bo, XE_PL_TT);
- xe_bo_unlock_no_vm(bo);
+ xe_bo_unlock(bo);
return 0;
}