Patch "drm/xe: Fix exporting xe buffers multiple times" has been added to the 6.12-stable tree
Subsystems (2)
[email protected]
AppliedThis is a note to let you know that I've just added the patch titled
drm/xe: Fix exporting xe buffers multiple times
to the 6.12-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-xe-fix-exporting-xe-buffers-multiple-times.patch
and it can be found in the queue-6.12 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
From 50af7cab7520e46680cf4633bba6801443b75856 Mon Sep 17 00:00:00 2001
From: Tomasz Rusinowicz <[email protected]>
Date: Tue, 18 Feb 2025 11:03:53 +0100
Subject: drm/xe: Fix exporting xe buffers multiple times
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Tomasz Rusinowicz <[email protected]>
commit 50af7cab7520e46680cf4633bba6801443b75856 upstream.
The struct ttm_resource->placement contains TTM_PL_FLAG_* flags, but it was incorrectly tested for XE_PL_* flags.
This caused xe_dma_buf_pin() to always fail when invoked for the second time. Fix this by checking the mem_type field instead.
--- drivers/gpu/drm/xe/xe_bo.h | 2 -- drivers/gpu/drm/xe/xe_dma_buf.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-)
drivers/gpu/drm/xe/xe_bo.h +0 -2
@@ -314,7 +314,6 @@ static inline unsigned int xe_sg_segment#define i915_gem_object_flush_if_display (obj) ((void)(obj)) -#if IS_ENABLED (CONFIG_DRM_XE_KUNIT_TEST )/** * xe_bo_is_mem_type - Whether the bo currently resides in the given * TTM memory type
@@ -329,4 +328,3 @@ static inline bool xe_bo_is_mem_type(str return bo->ttm.resource->mem_type == mem_type; }#endif -#endif
drivers/gpu/drm/xe/xe_dma_buf.c +1 -1
@@ -58,7 +58,7 @@ static int xe_dma_buf_pin(struct dma_buf* 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 ; }
Patches currently in stable-queue which might be from [email protected] are
queue-6.12/drm-xe-fix-exporting-xe-buffers-multiple-times.patch