Commit b62f828a authored Dec 05, 2023 by Michał Winiarski Committed by Rodrigo Vivi Dec 21, 2023

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>

parent 1ccd68e9

drivers/gpu/drm/xe/xe_device.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -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;

drivers/gpu/drm/xe/xe_gt.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -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;