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 <michal.winiarski@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
This commit is contained in:
Michał Winiarski 2023-12-05 02:33:02 +01:00 committed by Rodrigo Vivi
parent 1ccd68e967
commit b62f828a83
2 changed files with 3 additions and 2 deletions

View File

@ -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;

View File

@ -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;