]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/xe/mocs: Initialize MOCS index early
authorBalasubramani Vivekanandan <balasubramani.vivekanandan@intel.com>
Tue, 20 May 2025 14:24:45 +0000 (19:54 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 24 Jul 2025 06:58:43 +0000 (08:58 +0200)
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

index 7b8556fa174352e931f314371b913857a571f856..61cf0d2d11bc7b924e59c96bd6172049158f9211 100644 (file)
@@ -375,6 +375,8 @@ int xe_gt_init_early(struct xe_gt *gt)
        if (err)
                return err;
 
+       xe_mocs_init_early(gt);
+
        return 0;
 }
 
@@ -592,8 +594,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;