Commit b62f828a authored by Michał Winiarski's avatar Michał Winiarski Committed by Rodrigo Vivi

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: default avatarMichał Winiarski <michal.winiarski@intel.com>
Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 1ccd68e9
...@@ -415,6 +415,9 @@ int xe_device_probe(struct xe_device *xe) ...@@ -415,6 +415,9 @@ int xe_device_probe(struct xe_device *xe)
xe_ttm_sys_mgr_init(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); err = drmm_add_action_or_reset(&xe->drm, xe_driver_flr_fini, xe);
if (err) if (err)
return err; return err;
......
...@@ -293,8 +293,6 @@ int xe_gt_init_early(struct xe_gt *gt) ...@@ -293,8 +293,6 @@ int xe_gt_init_early(struct xe_gt *gt)
{ {
int err; int err;
xe_force_wake_init_gt(gt, gt_to_fw(gt));
err = xe_force_wake_get(gt_to_fw(gt), XE_FW_GT); err = xe_force_wake_get(gt_to_fw(gt), XE_FW_GT);
if (err) if (err)
return err; return err;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment