6.12-stable review patch. If anyone has any objections, please let me know.
------------------
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.vivekananda... 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;