FAILED: patch "[PATCH] drm/xe/guc_ads: use uncached mapping for UM queue BO" failed to apply to 6.18-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 6.18-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.18.y
git checkout FETCH_HEAD
git cherry-pick -x 8d5134ae4177fa4f5a9bc8e71e6656cfc2852882
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026082055-unvaried-abnormal-f1b2@gregkh' --subject-prefix 'PATCH 6.18.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 8d5134ae4177fa4f5a9bc8e71e6656cfc2852882 Mon Sep 17 00:00:00 2001
From: Jia Yao <[email protected]>
Date: Tue, 4 Aug 2026 16:50:57 +0000
Subject: [PATCH] drm/xe/guc_ads: use uncached mapping for UM queue BO
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
On Pre-Xe3p platform, the GAM write the UM queue through DPA using UC. if GuC reads the queue via GGTT (WB), stale data may be observed when the cacheline has been polluted by another agent.
To match the GAM's UC writes, configure the GuC mapping as UC as well.
Reviewed by: Matthew Auld <[email protected]>
drivers/gpu/drm/xe/xe_guc_ads.c +2 -1
@@ -406,7 +406,8 @@ int xe_guc_ads_init(struct xe_guc_ads *ads)u32 um_flags =XE_BO_FLAG_VRAM_IF_DGFX (tile) |XE_BO_FLAG_GGTT |XE_BO_FLAG_GGTT_INVALIDATE | -XE_BO_FLAG_PINNED_NORESTORE ; +XE_BO_FLAG_PINNED_NORESTORE | +XE_BO_FLAG_NEEDS_UC ; bo =xe_managed_bo_create_pin_map (xe, tile, um_size, um_flags);if (IS_ERR (bo))
PATCH 1/1 drm/xe/guc_ads: use uncached mapping for UM queue BO
On Pre-Xe3p platform, the GAM write the UM queue through DPA using UC. if GuC reads the queue via GGTT (WB), stale data may be observed when the cacheline has been polluted by another agent.
To match the GAM's UC writes, configure the GuC mapping as UC as well.
Reviewed by: Matthew Auld <[email protected]>
--- drivers/gpu/drm/xe/xe_guc_ads.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/xe/xe_guc_ads.c +2 -1
@@ -405,7 +405,8 @@ int xe_guc_ads_init(struct xe_guc_ads *ads)u32 um_flags =XE_BO_FLAG_VRAM_IF_DGFX (tile) |XE_BO_FLAG_GGTT |XE_BO_FLAG_GGTT_INVALIDATE | -XE_BO_FLAG_PINNED_NORESTORE ; +XE_BO_FLAG_PINNED_NORESTORE | +XE_BO_FLAG_NEEDS_UC ; bo =xe_managed_bo_create_pin_map (xe, tile, um_size, um_flags);if (IS_ERR (bo))
Signature · 1 line
2.43.0