[Intel-xe] [PATCH 34/37] drm/xe: Move xe_ttm_stolen_mgr_init back

[Rodrigo Vivi]

From: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>

Signed-off-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
Cc: Philippe Lecluse <philippe.lecluse at intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
---
 drivers/gpu/drm/xe/xe_device.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c
index c8b4c580bd98..14af3f58c75d 100644
--- a/drivers/gpu/drm/xe/xe_device.c
+++ b/drivers/gpu/drm/xe/xe_device.c
@@ -405,9 +405,6 @@ int xe_device_probe(struct xe_device *xe)
 			return err;
 	}
 
-	/* Harmless if stolen initialization fails */
-	xe_ttm_stolen_mgr_init(xe);
-
 	err = xe_device_init_display_noirq(xe);
 	if (err)
 		return err;
@@ -432,6 +429,9 @@ int xe_device_probe(struct xe_device *xe)
 			goto err_irq_shutdown;
 	}
 
+	/* Allocate and map stolen after potential VRAM resize */
+	xe_ttm_stolen_mgr_init(xe);
+
 	/*
 	 * Now that GT is initialized (TTM in particular),
 	 * we can try to init display, and inherit the initial fb.
-- 
2.38.1