summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhanjun Dong <zhanjun.dong@intel.com>2024-02-27 08:49:22 -0800
committerLucas De Marchi <lucas.demarchi@intel.com>2024-02-28 14:49:58 -0800
commit4c47049d93b7a7fc2230cded84a6aec6bbd3d61e (patch)
tree3601b3e07b834d930306fd7039b43ae1a88e893e
parent1408784b599927d2f361bac6dc5170d2ee275f17 (diff)
downloadlinux-4c47049d93b7a7fc2230cded84a6aec6bbd3d61e.tar.gz
linux-4c47049d93b7a7fc2230cded84a6aec6bbd3d61e.tar.bz2
linux-4c47049d93b7a7fc2230cded84a6aec6bbd3d61e.zip
drm/xe/guc: Fix missing topology init
init_steering_dss need topology dss mask to be init ahead. Fixed by moving xe_gt_topology_init ahead of xe_gt_mcr_init Fixes: bf8ec3c3e82c ("drm/xe: Initialize GuC earlier during probe") Cc: MichaƂ Winiarski <michal.winiarski@intel.com> Signed-off-by: Zhanjun Dong <zhanjun.dong@intel.com> Reviewed-by: Matt Roper <matthew.d.roper@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20240227164922.281346-2-zhanjun.dong@intel.com Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
-rw-r--r--drivers/gpu/drm/xe/xe_gt.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/xe/xe_gt.c b/drivers/gpu/drm/xe/xe_gt.c
index 45646d3aea2d..85408e7a932b 100644
--- a/drivers/gpu/drm/xe/xe_gt.c
+++ b/drivers/gpu/drm/xe/xe_gt.c
@@ -315,8 +315,6 @@ int xe_gt_init_early(struct xe_gt *gt)
if (err)
return err;
- xe_gt_topology_init(gt);
-
err = xe_force_wake_put(gt_to_fw(gt), XE_FW_GT);
if (err)
return err;
@@ -503,6 +501,7 @@ int xe_gt_init_hwconfig(struct xe_gt *gt)
if (err)
goto out;
+ xe_gt_topology_init(gt);
xe_gt_mcr_init(gt);
xe_pat_init(gt);