From: Lucas De Marchi Date: Mon, 13 May 2024 21:37:50 +0000 (-0700) Subject: drm/xe: Move xe_force_wake_init_gt() inside gt initialization X-Git-Tag: v6.11-rc1~141^2~26^2~137 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=45b9066ec351518657cd09599872f737ceb25f09;p=thirdparty%2Fkernel%2Flinux.git 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 Reviewed-by: Rodrigo Vivi Link: https://patchwork.freedesktop.org/patch/msgid/20240513213751.1017791-4-lucas.demarchi@intel.com Signed-off-by: Lucas De Marchi --- diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c index 9c32bd157ecf4..ad18c48cab99e 100644 --- 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 05b77214f9965..e05899691a8c5 100644 --- 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; }