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: Lucas De Marchi <lucas.demarchi@intel.com> Link: https://lore.kernel.org/r/20250619104858.418440-21-dev@lankhorst.se Signed-off-by: Maarten Lankhorst <dev@lankhorst.se>
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user