Commit b6308aaa authored by Matthew Brost's avatar Matthew Brost
Browse files

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: default avatarMatthew Auld <matthew.auld@intel.com>
Signed-off-by: default avatarMatthew Brost <matthew.brost@intel.com>
Reviewed-by: default avatarMatthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241126174615.2665852-6-matthew.brost@intel.com
parent 1c6878af

drivers/gpu/drm/xe/display/intel_bo.c

+1 −24
Original line number Diff line number Diff line
@@ -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)