This is a note to let you know that I've just added the patch titled
drm/amdgpu/dma_buf: fix page_link check
to the 6.14-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-amdgpu-dma_buf-fix-page_link-check.patch
and it can be found in the queue-6.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <sta...@vger.kernel.org> know about it.
>From c0dd8a9253fadfb8e5357217d085f1989da4ef0a Mon Sep 17 00:00:00 2001
From: Matthew Auld <matthew.a...@intel.com>
Date: Mon, 7 Apr 2025 15:18:25 +0100
Subject: drm/amdgpu/dma_buf: fix page_link check
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Matthew Auld <matthew.a...@intel.com>
commit c0dd8a9253fadfb8e5357217d085f1989da4ef0a upstream.
The page_link lower bits of the first sg could contain something like
SG_END, if we are mapping a single VRAM page or contiguous blob which
fits into one sg entry. Rather pull out the struct page, and use that in
our check to know if we mapped struct pages vs VRAM.
Fixes: f44ffd677fb3 ("drm/amdgpu: add support for exporting VRAM using DMA-buf
v3")
Signed-off-by: Matthew Auld <matthew.a...@intel.com>
Cc: Christian König <christian.koe...@amd.com>
Cc: amd-gfx@lists.freedesktop.org
Cc: <sta...@vger.kernel.org> # v5.8+
Reviewed-by: Christian König <christian.koe...@amd.com>
Signed-off-by: Alex Deucher <alexander.deuc...@amd.com>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c
@@ -184,7 +184,7 @@ static void amdgpu_dma_buf_unmap(struct
struct sg_table *sgt,
enum dma_data_direction dir)
{
- if (sgt->sgl->page_link) {
+ if (sg_page(sgt->sgl)) {
dma_unmap_sgtable(attach->dev, sgt, dir, 0);
sg_free_table(sgt);
kfree(sgt);
Patches currently in stable-queue which might be from matthew.a...@intel.com are
queue-6.14/drm-xe-dma_buf-stop-relying-on-placement-in-unmap.patch
queue-6.14/drm-xe-use-local-fence-in-error-path-of-xe_migrate_clear.patch
queue-6.14/drm-amdgpu-dma_buf-fix-page_link-check.patch
queue-6.14/drm-xe-userptr-fix-notifier-vs-folio-deadlock.patch
