From: Michał Winiarski Date: Tue, 5 Dec 2023 01:33:02 +0000 (+0100) Subject: drm/xe: Move force_wake init to earlier point in probe X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b62f828a8368de59eb5b353788ace58fb6154495;p=linux.git drm/xe: Move force_wake init to earlier point in probe GuC will need to be loaded earlier during probe. And in order to load GuC, being able to take the forcewake is going to be needed. Signed-off-by: Michał Winiarski Reviewed-by: Matt Roper Signed-off-by: Rodrigo Vivi --- diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c index dd56a8c3f80d4..bcc10b7f23ab7 100644 --- a/drivers/gpu/drm/xe/xe_device.c +++ b/drivers/gpu/drm/xe/xe_device.c @@ -415,6 +415,9 @@ int xe_device_probe(struct xe_device *xe) xe_ttm_sys_mgr_init(xe); + for_each_gt(gt, xe, id) + xe_force_wake_init_gt(gt, gt_to_fw(gt)); + err = drmm_add_action_or_reset(&xe->drm, xe_driver_flr_fini, xe); if (err) return err; diff --git a/drivers/gpu/drm/xe/xe_gt.c b/drivers/gpu/drm/xe/xe_gt.c index 8a6fb9641cd69..4db94344bbde7 100644 --- a/drivers/gpu/drm/xe/xe_gt.c +++ b/drivers/gpu/drm/xe/xe_gt.c @@ -293,8 +293,6 @@ int xe_gt_init_early(struct xe_gt *gt) { int err; - xe_force_wake_init_gt(gt, gt_to_fw(gt)); - err = xe_force_wake_get(gt_to_fw(gt), XE_FW_GT); if (err) return err;