From: Michał Winiarski Date: Tue, 5 Dec 2023 01:33:01 +0000 (+0100) Subject: drm/xe: Move system memory management init to earlier point in probe X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1ccd68e967f13a584bf3d45a58865afb0abbf2a4;p=linux.git drm/xe: Move system memory management init to earlier point in probe 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 --- diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c index f4be4b13a506e..dd56a8c3f80d4 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)