Skip to contentSkip to conversation

FAILED: patch "[PATCH] drm/xe/vram: report FLAT_CCS base misalignment" failed to apply to 7.3-stable tree

PATCH Sasha Levin 1 participant 1 message Nov 7

Subsystems (3)
lore
Share & tools
lore

Sasha Levin

author maintainer
#0 lore raw

The patch below does not apply to the 7.3-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-7.3.y
git checkout FETCH_HEAD
git cherry-pick -x d00b7f4f03bbeb2efad872f1686130e18c2b4141
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '[email protected]' --subject-prefix 'PATCH 7.3.y' 'HEAD^..'

Thanks,
Sasha

------------------ original commit in Linus's tree ------------------

From d00b7f4f03bbeb2efad872f1686130e18c2b4141 Mon Sep 17 00:00:00 2001
From: Matthew Auld <[email protected]>
Date: Wed, 2 Sep 2026 13:41:20 +0100
Subject: [PATCH] drm/xe/vram: report FLAT_CCS base misalignment
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

So we can easily check if a machine had the CCS bug, when looking back over bug reports where we have the same machine with newer kernel.

Example print for a machine with the CCS bug:

FLAT_CCS base:27bbff800, aligned:no

v2 (Matt B):
- Unconditionally print the base + alignment

Fixes 37173392741c ("drm/xe/vram: fix ccs offset calculation")
Cc Thomas Hellström <[email protected]>
Cc Matthew Brost <[email protected]>
Cc Rodrigo Vivi <[email protected]>
---
 drivers/gpu/drm/xe/xe_vram.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/gpu/drm/xe/xe_vram.c +3 -0
index 7b4478fb1697c..56cff1e44530b 100644
@@ -90,6 +90,9 @@ static int get_flat_ccs_offset(struct xe_gt *gt, u64 tile_size, u64 *poffset)
 		offset |= offset_lo << 6; /* HW view bits 31:6 */
 		offset *= num_enabled; /* convert to SW view */
 
+		drm_info(&xe->drm, "FLAT_CCS base:%llx, aligned:%s\n", offset,
+			 str_yes_no(IS_ALIGNED(offset, SZ_128K)));
+
 		/*
 		 * Everything below this offset is handed to the VRAM
 		 * allocator, so it has to be the *first* address the
Signature · 1 line
2.53.0