drm/i915/vlv: move DPIO common reset de-assert into __vlv_set_power_well

We need to do this anytime we power gate the DPIO common well.

Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 4973fe03f9aa0a04c6acd64f4aa2ce9fef599854..de5992b71ed919ab7fdec217a56d4576be0e7f43 100644 (file)
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -1525,19 +1525,6 @@ static void intel_reset_dpio(struct drm_device *dev)
                                     false);
                __vlv_set_power_well(dev_priv, PUNIT_POWER_WELL_DPIO_CMN_BC,
                                     true);
-
-               /*
-                * From VLV2A0_DP_eDP_DPIO_driver_vbios_notes_10.docx -
-                *  6.  De-assert cmn_reset/side_reset. Same as VLV X0.
-                *   a. GUnit 0x2110 bit[0] set to 1 (def 0)
-                *   b. The other bits such as sfr settings / modesel may all
-                *      be set to 0.
-                *
-                * This should only be done on init and resume from S3 with
-                * both PLLs disabled, or we risk losing DPIO and PLL
-                * synchronization.
-                */
-               I915_WRITE(DPIO_CTL, I915_READ(DPIO_CTL) | DPIO_CMNRST);
        }
 }
 

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index c2cf9063dd7ab5edf335bed1256912df6a0e4428..cca93d06894c4593012a0072f7f3096df35a26bc 100644 (file)
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -5715,15 +5715,22 @@ void __vlv_set_power_well(struct drm_i915_private *dev_priv,
        u32 state;
        u32 ctrl;
 
-       if (power_well_id == PUNIT_POWER_WELL_DPIO_CMN_BC && enable) {
-               /*
-                * Enable the CRI clock source so we can get at the display
-                * and the reference clock for VGA hotplug / manual detection.
-                */
-               I915_WRITE(DPLL(PIPE_B), I915_READ(DPLL(PIPE_B)) |
-                          DPLL_REFA_CLK_ENABLE_VLV |
-                          DPLL_INTEGRATED_CRI_CLK_VLV);
-               udelay(1); /* >10ns for cmnreset, >0ns for sidereset */
+       if (power_well_id == PUNIT_POWER_WELL_DPIO_CMN_BC) {
+               if (enable) {
+                       /*
+                        * Enable the CRI clock source so we can get at the
+                        * display and the reference clock for VGA
+                        * hotplug / manual detection.
+                        */
+                       I915_WRITE(DPLL(PIPE_B), I915_READ(DPLL(PIPE_B)) |
+                                  DPLL_REFA_CLK_ENABLE_VLV |
+                                  DPLL_INTEGRATED_CRI_CLK_VLV);
+                       udelay(1); /* >10ns for cmnreset, >0ns for sidereset */
+               } else {
+                       /* Assert common reset */
+                       I915_WRITE(DPIO_CTL, I915_READ(DPIO_CTL) &
+                                  ~DPIO_CMNRST);
+               }
        }
 
        mask = PUNIT_PWRGT_MASK(power_well_id);
@@ -5752,6 +5759,20 @@ void __vlv_set_power_well(struct drm_i915_private *dev_priv,
 
 out:
        mutex_unlock(&dev_priv->rps.hw_lock);
+
+       /*
+        * From VLV2A0_DP_eDP_DPIO_driver_vbios_notes_10.docx -
+        *  6.  De-assert cmn_reset/side_reset. Same as VLV X0.
+        *   a. GUnit 0x2110 bit[0] set to 1 (def 0)
+        *   b. The other bits such as sfr settings / modesel may all
+        *      be set to 0.
+        *
+        * This should only be done on init and resume from S3 with
+        * both PLLs disabled, or we risk losing DPIO and PLL
+        * synchronization.
+        */
+       if (power_well_id == PUNIT_POWER_WELL_DPIO_CMN_BC && enable)
+               I915_WRITE(DPIO_CTL, I915_READ(DPIO_CTL) | DPIO_CMNRST);
 }
 
 static void vlv_set_power_well(struct drm_i915_private *dev_priv,