From 1ccd68e967f13a584bf3d45a58865afb0abbf2a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Winiarski?= Date: Tue, 5 Dec 2023 02:33:01 +0100 Subject: [PATCH] drm/xe: Move system memory management init to earlier point in probe MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GuC will need to be loaded earlier during probe. And in order to load GuC, we will need the ability to create system memory allocations. Signed-off-by: Michał Winiarski Reviewed-by: Matt Roper Signed-off-by: Rodrigo Vivi --- drivers/gpu/drm/xe/xe_device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c index f4be4b13a506..dd56a8c3f80d 100644 --- a/drivers/gpu/drm/xe/xe_device.c +++ b/drivers/gpu/drm/xe/xe_device.c @@ -413,6 +413,8 @@ int xe_device_probe(struct xe_device *xe) xe_mmio_probe_tiles(xe); + xe_ttm_sys_mgr_init(xe); + err = drmm_add_action_or_reset(&xe->drm, xe_driver_flr_fini, xe); if (err) return err; @@ -441,8 +443,6 @@ int xe_device_probe(struct xe_device *xe) if (err) goto err_irq_shutdown; - xe_ttm_sys_mgr_init(xe); - for_each_tile(tile, xe, id) { err = xe_tile_init_noalloc(tile); if (err)