Skip to contentSkip to conversation

FAILED: patch "[PATCH] drm/xe: Move page fault init after topology init" failed to apply to 6.12-stable tree

PATCH New [email protected] 2 participants 3 messages Jul 21, 2025 – Jul 22, 2025

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 6.12-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.12.y
git checkout FETCH_HEAD
git cherry-pick -x 3155ac89251dcb5e35a3ec2f60a74a6ed22c56fd
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2025072101-drastic-gentile-dc59@gregkh' --subject-prefix 'PATCH 6.12.y' HEAD^..

Possible dependencies:

thanks,

greg k-h

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

From 3155ac89251dcb5e35a3ec2f60a74a6ed22c56fd Mon Sep 17 00:00:00 2001
From: Matthew Brost <[email protected]>
Date: Thu, 10 Jul 2025 12:12:08 -0700
Subject: [PATCH] drm/xe: Move page fault init after topology init

We need the topology to determine GT page fault queue size, move page fault init after topology init.

Fixes 3338e4f90c14 ("drm/xe: Use topology to determine page fault queue size")
(cherry picked from commit beb72acb5b38dbe670d8eb752d1ad7a32f9c4119)
drivers/gpu/drm/xe/xe_gt.c +4 -4
index 9752a38c0162..d554a8cc565c 100644
@@ -632,10 +632,6 @@ int xe_gt_init(struct xe_gt *gt)
 	if (err)
 		return err;
 
-	err = xe_gt_pagefault_init(gt);
-	if (err)
-		return err;
-
 	err = xe_gt_sysfs_init(gt);
 	if (err)
 		return err;
@@ -644,6 +640,10 @@ int xe_gt_init(struct xe_gt *gt)
 	if (err)
 		return err;
 
+	err = xe_gt_pagefault_init(gt);
+	if (err)
+		return err;
+
 	err = xe_gt_idle_init(&gt->gtidle);
 	if (err)
 		return err;
maintainer
#1 lore raw

PATCH 1/2 drm/xe/mocs: Initialize MOCS index early

From: Balasubramani Vivekanandan <[email protected]>

[ Upstream commit 2a58b21adee3df10ca6f4491af965c4890d2d8e3 ]

MOCS uc_index is used even before it is initialized in the following callstack

    guc_prepare_xfer()
    __xe_guc_upload()
    xe_guc_min_load_for_hwconfig()
    xe_uc_init_hwconfig()
    xe_gt_init_hwconfig()

Do MOCS index initialization earlier in the device probe.

Stable-dep-of: 3155ac89251d ("drm/xe: Move page fault init after topology init")

---
 drivers/gpu/drm/xe/xe_gt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/xe/xe_gt.c +2 -2
index 231ed53cf907c..b3a5083b1c848 100644
@@ -389,6 +389,8 @@ int xe_gt_init_early(struct xe_gt *gt)
 	if (err)
 		return err;
 
+	xe_mocs_init_early(gt);
+
 	return 0;
 }
 
@@ -596,8 +598,6 @@ int xe_gt_init(struct xe_gt *gt)
 	if (err)
 		return err;
 
-	xe_mocs_init_early(gt);
-
 	err = xe_gt_sysfs_init(gt);
 	if (err)
 		return err;
Signature · 1 line
2.39.5
maintainer
#2 lore raw

PATCH 2/2 drm/xe: Move page fault init after topology init

From: Matthew Brost <[email protected]>

[ Upstream commit 3155ac89251dcb5e35a3ec2f60a74a6ed22c56fd ]

We need the topology to determine GT page fault queue size, move page fault init after topology init.

Fixes 3338e4f90c14 ("drm/xe: Use topology to determine page fault queue size")
(cherry picked from commit beb72acb5b38dbe670d8eb752d1ad7a32f9c4119)
---
 drivers/gpu/drm/xe/xe_gt.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/xe/xe_gt.c +3 -3
index b3a5083b1c848..da692a7fc8866 100644
@@ -594,15 +594,15 @@ int xe_gt_init(struct xe_gt *gt)
 		xe_hw_fence_irq_init(&gt->fence_irq[i]);
 	}
 
-	err = xe_gt_pagefault_init(gt);
+	err = xe_gt_sysfs_init(gt);
 	if (err)
 		return err;
 
-	err = xe_gt_sysfs_init(gt);
+	err = gt_fw_domain_init(gt);
 	if (err)
 		return err;
 
-	err = gt_fw_domain_init(gt);
+	err = xe_gt_pagefault_init(gt);
 	if (err)
 		return err;
 
Signature · 1 line
2.39.5