aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhanjun Dong <[email protected]>2024-02-27 08:49:22 -0800
committerLucas De Marchi <[email protected]>2024-03-04 08:41:17 -0600
commit9eeeed8d7e1db88b3611585dd630beb9efb1ee7b (patch)
treea72777ea108860f867e827e96cd542339b87e2d4
parent45cfade303335c486300b81e62caefffa843f585 (diff)
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 <[email protected]> Signed-off-by: Zhanjun Dong <[email protected]> Reviewed-by: Matt Roper <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] Signed-off-by: Lucas De Marchi <[email protected]> (cherry picked from commit 4c47049d93b7a7fc2230cded84a6aec6bbd3d61e) Signed-off-by: Lucas De Marchi <[email protected]>
-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 b75f0bf0a9a1..a0afe1ba6dd5 100644
--- a/drivers/gpu/drm/xe/xe_gt.c
+++ b/drivers/gpu/drm/xe/xe_gt.c
@@ -314,8 +314,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;
@@ -502,6 +500,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);