drm/xe/display: Update intel_bo_read_from_page to use ttm_bo_access

Don't open code vmap of a BO, use ttm_bo_access helper which is safe for
non-contiguous BOs and non-visible BOs.

Suggested-by: Matthew Auld <matthew.auld@intel.com>
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241126174615.2665852-6-matthew.brost@intel.com

diff --git a/drivers/gpu/drm/xe/display/intel_bo.c b/drivers/gpu/drm/xe/display/intel_bo.c
index 9f54fad0f1c0c8640f3ab92fbffca8969ccd5c82..43141964f6f23f171a925994e683957cb84c3354 100644 (file)
--- a/drivers/gpu/drm/xe/display/intel_bo.c
+++ b/drivers/gpu/drm/xe/display/intel_bo.c
@@ -40,31 +40,8 @@ int intel_bo_fb_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma)
 int intel_bo_read_from_page(struct drm_gem_object *obj, u64 offset, void *dst, int size)
 {
        struct xe_bo *bo = gem_to_xe_bo(obj);
-       struct ttm_bo_kmap_obj map;
-       void *src;
-       bool is_iomem;
-       int ret;
 
-       ret = xe_bo_lock(bo, true);
-       if (ret)
-               return ret;
-
-       ret = ttm_bo_kmap(&bo->ttm, offset >> PAGE_SHIFT, 1, &map);
-       if (ret)
-               goto out_unlock;
-
-       offset &= ~PAGE_MASK;
-       src = ttm_kmap_obj_virtual(&map, &is_iomem);
-       src += offset;
-       if (is_iomem)
-               memcpy_fromio(dst, (void __iomem *)src, size);
-       else
-               memcpy(dst, src, size);
-
-       ttm_bo_kunmap(&map);
-out_unlock:
-       xe_bo_unlock(bo);
-       return ret;
+       return ttm_bo_access(&bo->ttm, offset, dst, size, 0);
 }
 
 struct intel_frontbuffer *intel_bo_get_frontbuffer(struct drm_gem_object *obj)