[PATCH v2 1/1] drm/i915/gt: Disable migration code on suspend

[Thomas Hellström]

Signed-off-by: Thomas Hellström <thomas.hellstrom at linux.intel.com>
---
 drivers/gpu/drm/i915/gt/intel_gt.c    | 4 ----
 drivers/gpu/drm/i915/gt/intel_gt_pm.c | 3 +++
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/gt/intel_gt.c b/drivers/gpu/drm/i915/gt/intel_gt.c
index 62d40c986642..1943d0ec7830 100644
--- a/drivers/gpu/drm/i915/gt/intel_gt.c
+++ b/drivers/gpu/drm/i915/gt/intel_gt.c
@@ -13,7 +13,6 @@
 #include "intel_gt_clock_utils.h"
 #include "intel_gt_pm.h"
 #include "intel_gt_requests.h"
-#include "intel_migrate.h"
 #include "intel_mocs.h"
 #include "intel_rc6.h"
 #include "intel_renderstate.h"
@@ -708,8 +707,6 @@ int intel_gt_init(struct intel_gt *gt)
 	if (err)
 		goto err_gt;
 
-	intel_migrate_init(&gt->migrate, gt);
-
 	goto out_fw;
 err_gt:
 	__intel_gt_disable(gt);
@@ -733,7 +730,6 @@ void intel_gt_driver_remove(struct intel_gt *gt)
 {
 	__intel_gt_disable(gt);
 
-	intel_migrate_fini(&gt->migrate);
 	intel_uc_driver_remove(&gt->uc);
 
 	intel_engines_release(gt);
diff --git a/drivers/gpu/drm/i915/gt/intel_gt_pm.c b/drivers/gpu/drm/i915/gt/intel_gt_pm.c
index dea8e2479897..e9a9a8d75067 100644
--- a/drivers/gpu/drm/i915/gt/intel_gt_pm.c
+++ b/drivers/gpu/drm/i915/gt/intel_gt_pm.c
@@ -14,6 +14,7 @@
 #include "intel_gt_pm.h"
 #include "intel_gt_requests.h"
 #include "intel_llc.h"
+#include "intel_migrate.h"
 #include "intel_pm.h"
 #include "intel_rc6.h"
 #include "intel_rps.h"
@@ -261,6 +262,7 @@ int intel_gt_resume(struct intel_gt *gt)
 	intel_rc6_enable(&gt->rc6);
 
 	intel_uc_resume(&gt->uc);
+	intel_migrate_init(&gt->migrate, gt);
 
 	user_forcewake(gt, false);
 
@@ -295,6 +297,7 @@ void intel_gt_suspend_prepare(struct intel_gt *gt)
 {
 	user_forcewake(gt, true);
 	wait_for_suspend(gt);
+	intel_migrate_fini(&gt->migrate);
 
 	intel_uc_suspend(&gt->uc);
 }
-- 
2.31.1