Commit 5854df50 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-xe-fixes-2025-03-20' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-fixes 



Driver Changes:
- Fix for an error if exporting a dma-buf multiple time (Tomasz)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Thomas Hellstrom <thomas.hellstrom@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/Z9xalLaCWsNbh0P0@fedora
parents d2738724 50af7cab

drivers/gpu/drm/xe/xe_bo.h

+0 −2
Original line number Diff line number Diff line
@@ -341,7 +341,6 @@ static inline unsigned int xe_sg_segment_size(struct device *dev) 
	return round_down(max / 2, PAGE_SIZE);

}



#if IS_ENABLED(CONFIG_DRM_XE_KUNIT_TEST)

/**

 * xe_bo_is_mem_type - Whether the bo currently resides in the given

 * TTM memory type
@@ -356,4 +355,3 @@ static inline bool xe_bo_is_mem_type(struct xe_bo *bo, u32 mem_type) 
	return bo->ttm.resource->mem_type == mem_type;

}

#endif
 
#endif

drivers/gpu/drm/xe/xe_dma_buf.c

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ static int xe_dma_buf_pin(struct dma_buf_attachment *attach) 
	 * 1) Avoid pinning in a placement not accessible to some importers.

	 * 2) Pinning in VRAM requires PIN accounting which is a to-do.

	 */

	if (xe_bo_is_pinned(bo) && bo->ttm.resource->placement != XE_PL_TT) {

	if (xe_bo_is_pinned(bo) && !xe_bo_is_mem_type(bo, XE_PL_TT)) {

		drm_dbg(&xe->drm, "Can't migrate pinned bo for dma-buf pin.\n");

		return -EINVAL;

	}