Commit 65c4de2a authored May 13, 2024 by Lucas De Marchi

drm/xe: Move xe_gt_init_early() where it belongs

Early shall be early enough, stop doing other things with gt before it.
Now that xe_gt_init_early() doesn't need forcewake and doesn't depend on
the fake engine_mask initialization, move it where it belongs: it
doesn't need to be after hwconfig config anymore.

Reviewed-by: Michał Winiarski <michal.winiarski@intel.com>
Reviewed-by: Vinay Belgaumkar <vinay.belgaumkar@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240513213751.1017791-3-lucas.demarchi@intel.com

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>

parent 402c014c

drivers/gpu/drm/xe/xe_device.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -567,6 +567,12 @@ int xe_device_probe(struct xe_device *xe)

		xe_ttm_sys_mgr_init(xe);

		for_each_gt(gt, xe, id) {
		err = xe_gt_init_early(gt);
		if (err)
		return err;
		}

		for_each_gt(gt, xe, id)
		xe_force_wake_init_gt(gt, gt_to_fw(gt));

		@@ -605,12 +611,6 @@ int xe_device_probe(struct xe_device *xe)
		if (err)
		goto err;

		for_each_gt(gt, xe, id) {
		err = xe_gt_init_early(gt);
		if (err)
		goto err_irq_shutdown;
		}

		err = xe_device_set_has_flat_ccs(xe);
		if (err)
		goto err_irq_shutdown;