[PATCH 12/31] reorder-rps-rc6-init

[Chris Wilson]

---
 drivers/gpu/drm/i915/i915_drv.c         |  2 ++
 drivers/gpu/drm/i915/i915_gem.c         | 21 ++++++++++++++++-----
 drivers/gpu/drm/i915/i915_gem_request.c |  3 ---
 drivers/gpu/drm/i915/intel_display.c    |  5 -----
 4 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index afb5528c7f10..7e48f9d439cc 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1155,6 +1155,7 @@ static int i915_driver_init_hw(struct drm_i915_private *dev_priv)
 
 	/* BIOS often leaves RC6 enabled, but disable it for hw init */
 	intel_gt_pm_sanitize(dev_priv);
+	intel_gt_pm_init(dev_priv);
 
 	intel_opregion_setup(dev_priv);
 
@@ -1203,6 +1204,7 @@ static void i915_driver_cleanup_hw(struct drm_i915_private *dev_priv)
 	if (pdev->msi_enabled)
 		pci_disable_msi(pdev);
 
+	intel_gt_pm_fini(dev_priv);
 	pm_qos_remove_request(&dev_priv->pm_qos);
 	i915_ggtt_cleanup_hw(dev_priv);
 }
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 7a3e9148724b..e7b5d84384b2 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -3121,10 +3121,12 @@ void i915_gem_reset(struct drm_i915_private *dev_priv)
 
 	i915_gem_restore_fences(dev_priv);
 
-	if (dev_priv->gt.awake) {
-		intel_gt_pm_sanitize(dev_priv);
-		intel_gt_enable_rps(dev_priv);
+	if (dev_priv->gt_pm.rc6.enabled) {
+		dev_priv->gt_pm.rc6.enabled = false;
 		intel_gt_enable_rc6(dev_priv);
+	}
+
+	if (dev_priv->gt.awake) {
 		if (INTEL_GEN(dev_priv) >= 6)
 			gen6_rps_busy(dev_priv);
 	}
@@ -4859,10 +4861,17 @@ void i915_gem_resume(struct drm_i915_private *i915)
 
 	intel_guc_resume(i915);
 
+	intel_gt_enable_rps(i915);
+
 	/* Always reload a context for powersaving. */
 	if (i915_gem_switch_to_kernel_context(i915))
 		goto err_wedged;
 
+	if (i915_gem_wait_for_idle(i915, I915_WAIT_LOCKED))
+		goto err_wedged;
+
+	intel_gt_enable_rc6(i915);
+
 out_unlock:
 	intel_uncore_forcewake_put(i915, FORCEWAKE_ALL);
 	mutex_unlock(&i915->drm.struct_mutex);
@@ -5040,6 +5049,8 @@ static int __intel_engines_record_defaults(struct drm_i915_private *i915)
 			goto err_active;
 	}
 
+	intel_gt_enable_rps(i915);
+
 	err = i915_gem_switch_to_kernel_context(i915);
 	if (err)
 		goto err_active;
@@ -5048,6 +5059,8 @@ static int __intel_engines_record_defaults(struct drm_i915_private *i915)
 	if (err)
 		goto err_active;
 
+	intel_gt_enable_rc6(i915);
+
 	assert_kernel_context_is_current(i915);
 
 	for_each_engine(engine, i915, id) {
@@ -5164,8 +5177,6 @@ int i915_gem_init(struct drm_i915_private *dev_priv)
 	if (ret)
 		goto out_unlock;
 
-	intel_gt_pm_init(dev_priv);
-
 	ret = i915_gem_init_hw(dev_priv);
 	if (ret)
 		goto out_unlock;
diff --git a/drivers/gpu/drm/i915/i915_gem_request.c b/drivers/gpu/drm/i915/i915_gem_request.c
index b3cb723f83f4..ebf4a9107ccf 100644
--- a/drivers/gpu/drm/i915/i915_gem_request.c
+++ b/drivers/gpu/drm/i915/i915_gem_request.c
@@ -255,9 +255,6 @@ static void mark_busy(struct drm_i915_private *i915)
 	intel_runtime_pm_get_noresume(i915);
 	i915->gt.awake = true;
 
-	intel_gt_enable_rps(i915);
-	intel_gt_enable_rc6(i915);
-
 	i915_update_gfx_val(i915);
 	if (INTEL_GEN(i915) >= 6)
 		gen6_rps_busy(i915);
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index f26476f3cf83..aaed5230e3c5 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -15295,9 +15295,6 @@ void intel_modeset_cleanup(struct drm_device *dev)
 	flush_work(&dev_priv->atomic_helper.free_work);
 	WARN_ON(!llist_empty(&dev_priv->atomic_helper.free_list));
 
-	intel_gt_disable_rps(dev_priv);
-	intel_gt_disable_rc6(dev_priv);
-
 	/*
 	 * Interrupts and polling as the first thing to avoid creating havoc.
 	 * Too much stuff here (turning of connectors, ...) would
@@ -15325,8 +15322,6 @@ void intel_modeset_cleanup(struct drm_device *dev)
 
 	intel_cleanup_overlay(dev_priv);
 
-	intel_gt_pm_fini(dev_priv);
-
 	intel_teardown_gmbus(dev_priv);
 }
 
-- 
2.15.0