From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 22 Jul 2025 12:56:32 +0000 (+0200)
Subject: 6.12-stable patches
X-Git-Tag: v6.1.147~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f189df5999785cbada510ca38e671d92c04407a2;p=thirdparty%2Fkernel%2Fstable-queue.git

6.12-stable patches

added patches:
	drm-xe-mocs-initialize-mocs-index-early.patch
	drm-xe-move-page-fault-init-after-topology-init.patch
---

diff --git a/queue-6.12/drm-xe-mocs-initialize-mocs-index-early.patch b/queue-6.12/drm-xe-mocs-initialize-mocs-index-early.patch
new file mode 100644
index 0000000000..55f575575f
--- /dev/null
+++ b/queue-6.12/drm-xe-mocs-initialize-mocs-index-early.patch
@@ -0,0 +1,52 @@
+From 2a58b21adee3df10ca6f4491af965c4890d2d8e3 Mon Sep 17 00:00:00 2001
+From: Balasubramani Vivekanandan <balasubramani.vivekanandan@intel.com>
+Date: Tue, 20 May 2025 19:54:45 +0530
+Subject: drm/xe/mocs: Initialize MOCS index early
+
+From: Balasubramani Vivekanandan <balasubramani.vivekanandan@intel.com>
+
+commit 2a58b21adee3df10ca6f4491af965c4890d2d8e3 upstream.
+
+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.
+
+Signed-off-by: Balasubramani Vivekanandan <balasubramani.vivekanandan@intel.com>
+Reviewed-by: Ravi Kumar Vodapalli <ravi.kumar.vodapalli@intel.com>
+Link: https://lore.kernel.org/r/20250520142445.2792824-1-balasubramani.vivekanandan@intel.com
+Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
+(cherry picked from commit 241cc827c0987d7173714fc5a95a7c8fc9bf15c0)
+Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
+Stable-dep-of: 3155ac89251d ("drm/xe: Move page fault init after topology init")
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/xe/xe_gt.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/gpu/drm/xe/xe_gt.c
++++ b/drivers/gpu/drm/xe/xe_gt.c
+@@ -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;
diff --git a/queue-6.12/drm-xe-move-page-fault-init-after-topology-init.patch b/queue-6.12/drm-xe-move-page-fault-init-after-topology-init.patch
new file mode 100644
index 0000000000..ae2f72372b
--- /dev/null
+++ b/queue-6.12/drm-xe-move-page-fault-init-after-topology-init.patch
@@ -0,0 +1,47 @@
+From 3155ac89251dcb5e35a3ec2f60a74a6ed22c56fd Mon Sep 17 00:00:00 2001
+From: Matthew Brost <matthew.brost@intel.com>
+Date: Thu, 10 Jul 2025 12:12:08 -0700
+Subject: drm/xe: Move page fault init after topology init
+
+From: Matthew Brost <matthew.brost@intel.com>
+
+commit 3155ac89251dcb5e35a3ec2f60a74a6ed22c56fd upstream.
+
+We need the topology to determine GT page fault queue size, move page
+fault init after topology init.
+
+Cc: stable@vger.kernel.org
+Fixes: 3338e4f90c14 ("drm/xe: Use topology to determine page fault queue size")
+Signed-off-by: Matthew Brost <matthew.brost@intel.com>
+Reviewed-by: Jonathan Cavitt <jonathan.cavitt@intel.com>
+Reviewed-by: Stuart Summers <stuart.summers@intel.com>
+Link: https://lore.kernel.org/r/20250710191208.1040215-1-matthew.brost@intel.com
+(cherry picked from commit beb72acb5b38dbe670d8eb752d1ad7a32f9c4119)
+Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/xe/xe_gt.c |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/drivers/gpu/drm/xe/xe_gt.c
++++ b/drivers/gpu/drm/xe/xe_gt.c
+@@ -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;
+ 
diff --git a/queue-6.12/series b/queue-6.12/series
index d1bf1f85ca..eb29b9017b 100644
--- a/queue-6.12/series
+++ b/queue-6.12/series
@@ -153,3 +153,5 @@ i2c-omap-fix-an-error-handling-path-in-omap_i2c_probe.patch
 i2c-omap-handle-omap_i2c_init-errors-in-omap_i2c_probe.patch
 i2c-omap-fix-deprecated-of_property_read_bool-use.patch
 sched-freezer-remove-unnecessary-warning-in-__thaw_task.patch
+drm-xe-mocs-initialize-mocs-index-early.patch
+drm-xe-move-page-fault-init-after-topology-init.patch