summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Winiarski <michal.winiarski@intel.com>2023-12-05 02:33:01 +0100
committerRodrigo Vivi <rodrigo.vivi@intel.com>2023-12-21 11:45:11 -0500
commit1ccd68e967f13a584bf3d45a58865afb0abbf2a4 (patch)
treec4d7e7a1490e1f3c28d7a48dd9721d542fe05359
parent51fb5ef209b988a3acee3bc7de04bb70aec51ff5 (diff)
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 <michal.winiarski@intel.com> Reviewed-by: Matt Roper <matthew.d.roper@intel.com> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
-rw-r--r--drivers/gpu/drm/xe/xe_device.c4
1 files 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)