diff mbox

[4/8] drm/i915: Extract a common intel_resume_prepare() function

Message ID 1431975235-1037-5-git-send-email-damien.lespiau@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Lespiau, Damien May 18, 2015, 6:53 p.m. UTC 
On the suspend path, we shove the common low level code in
intel_suspend_complete() that is then called in both the runtime pm path
and the full S3/S4 path.

Let's do the same for the resume path, extracting an
intel_resume_prepare() function. This is especially nice as we forgot on
the two paths for BXT, so that should eliminate a source of bugs in the
future.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
---
 drivers/gpu/drm/i915/i915_drv.c | 47 ++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 24 deletions(-)
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 7eb751b..a29db40 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -592,11 +592,8 @@  static void intel_suspend_encoders(struct drm_i915_private *dev_priv)
 }
 
 static int intel_suspend_complete(struct drm_i915_private *dev_priv);
-static int vlv_resume_prepare(struct drm_i915_private *dev_priv,
-			      bool rpm_resume);
-static int skl_resume_prepare(struct drm_i915_private *dev_priv);
-static int bxt_resume_prepare(struct drm_i915_private *dev_priv);
-
+static int intel_resume_prepare(struct drm_i915_private *dev_priv,
+				bool rpm_resume);
 
 static int i915_drm_suspend(struct drm_device *dev)
 {
@@ -811,15 +808,7 @@  static int i915_drm_resume_early(struct drm_device *dev)
 
 	intel_uncore_early_sanitize(dev, true);
 
-	if (IS_BROXTON(dev))
-		ret = bxt_resume_prepare(dev_priv);
-	else if (IS_SKYLAKE(dev_priv))
-		ret = skl_resume_prepare(dev_priv);
-	else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv))
-		hsw_disable_pc8(dev_priv);
-	else if (IS_VALLEYVIEW(dev_priv))
-		ret = vlv_resume_prepare(dev_priv, false);
-
+	intel_resume_prepare(dev_priv, false);
 	if (ret)
 		DRM_ERROR("Resume prepare failed: %d,Continuing resume\n", ret);
 
@@ -1556,14 +1545,7 @@  static int intel_runtime_resume(struct device *device)
 	if (IS_GEN6(dev_priv))
 		intel_init_pch_refclk(dev);
 
-	if (IS_BROXTON(dev))
-		ret = bxt_resume_prepare(dev_priv);
-	else if (IS_SKYLAKE(dev))
-		ret = skl_resume_prepare(dev_priv);
-	else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv))
-		hsw_disable_pc8(dev_priv);
-	else if (IS_VALLEYVIEW(dev_priv))
-		ret = vlv_resume_prepare(dev_priv, true);
+	ret = intel_resume_prepare(dev_priv, true);
 
 	/*
 	 * No point of rolling back things in case of an error, as the best
@@ -1584,8 +1566,8 @@  static int intel_runtime_resume(struct device *device)
 }
 
 /*
- * This function implements common functionality of runtime and system
- * suspend sequence.
+ * This 2 functions implement common functionality of runtime and system
+ * suspend/resume sequence.
  */
 static int intel_suspend_complete(struct drm_i915_private *dev_priv)
 {
@@ -1606,6 +1588,23 @@  static int intel_suspend_complete(struct drm_i915_private *dev_priv)
 	return ret;
 }
 
+static int
+intel_resume_prepare(struct drm_i915_private *dev_priv, bool rpm_resume)
+{
+	int ret = 0;
+
+	if (IS_BROXTON(dev_priv))
+		ret = bxt_resume_prepare(dev_priv);
+	else if (IS_SKYLAKE(dev_priv))
+		ret = skl_resume_prepare(dev_priv);
+	else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv))
+		hsw_disable_pc8(dev_priv);
+	else if (IS_VALLEYVIEW(dev_priv))
+		ret = vlv_resume_prepare(dev_priv, rpm_resume);
+
+	return ret;
+}
+
 static const struct dev_pm_ops i915_pm_ops = {
 	/*
 	 * S0ix (via system suspend) and S3 event handlers [PMSG_SUSPEND,