drm/xe: Move xe_force_wake_init_gt() inside gt initialization

xe_force_wake_init_gt() is a software-only initialization and doesn't
need to be called from xe_device_probe(). Move it to initialize
together with the gt.

Reviewed-by: Michał Winiarski <michal.winiarski@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240513213751.1017791-4-lucas.demarchi@intel.com
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>

diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c
index 9c32bd157ecf47ad6f178309392b0473d8783b19..ad18c48cab99e8239caefa94d7d024802857c033 100644 (file)
--- a/drivers/gpu/drm/xe/xe_device.c
+++ b/drivers/gpu/drm/xe/xe_device.c
@@ -573,9 +573,6 @@ int xe_device_probe(struct xe_device *xe)
                        return err;
        }
 
-       for_each_gt(gt, xe, id)
-               xe_force_wake_init_gt(gt, gt_to_fw(gt));
-
        for_each_tile(tile, xe, id) {
                err = xe_ggtt_init_early(tile->mem.ggtt);
                if (err)

diff --git a/drivers/gpu/drm/xe/xe_gt.c b/drivers/gpu/drm/xe/xe_gt.c
index 05b77214f9965d48dcff9e3119ed3fdaa2801d97..e05899691a8c517dbc12476dbb0d4ec281ef2922 100644 (file)
--- a/drivers/gpu/drm/xe/xe_gt.c
+++ b/drivers/gpu/drm/xe/xe_gt.c
@@ -328,6 +328,8 @@ int xe_gt_init_early(struct xe_gt *gt)
        xe_wa_process_oob(gt);
        xe_tuning_process_gt(gt);
 
+       xe_force_wake_init_gt(gt, gt_to_fw(gt));
+
        return 0;
 }