Commit 3effd109 authored by Maarten Lankhorst's avatar Maarten Lankhorst
Browse files

drm/xe: Move xe_ttm_sys_mgr_init() downwards. 



Now that all previous allocations are gone, ensure no new allocations
will ever be done before xe_display_init_early(), by moving the call
that allows allocations downwards.

Reviewed-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Link: https://lore.kernel.org/r/20250619104858.418440-21-dev@lankhorst.se


Signed-off-by: default avatarMaarten Lankhorst <dev@lankhorst.se>
parent 11bf0f0b

drivers/gpu/drm/xe/xe_device.c

+8 −4
Original line number Diff line number Diff line
@@ -784,10 +784,6 @@ int xe_device_probe(struct xe_device *xe) 
	if (err)

		return err;



	err = xe_ttm_sys_mgr_init(xe);

	if (err)

		return err;



	for_each_gt(gt, xe, id) {

		err = xe_gt_init_early(gt);

		if (err)
@@ -825,6 +821,14 @@ int xe_device_probe(struct xe_device *xe) 
			return err;

	}



	/*

	 * Allow allocations only now to ensure xe_display_init_early()

	 * is the first to allocate, always.

	 */

	err = xe_ttm_sys_mgr_init(xe);

	if (err)

		return err;



	/* Allocate and map stolen after potential VRAM resize */

	err = xe_ttm_stolen_mgr_init(xe);

	if (err)