drm/i915/psr: Share PSR and PSR2 exit mask

Now both PSR and PSR2 have the same exit mask, so let's share then
instead of have the same code 2 times.

Reviewed-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181003205031.32474-1-jose.souza@intel.com

diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c
index 83528647b40b1f54d05cfe73ef3069f6d34d821a..102da7aae9d86d70dc29fe01bf389434062fe066 100644 (file)
--- a/drivers/gpu/drm/i915/intel_psr.c
+++ b/drivers/gpu/drm/i915/intel_psr.c
@@ -580,28 +580,20 @@ static void intel_psr_enable_source(struct intel_dp *intel_dp,
                else
                        chicken &= ~VSC_DATA_SEL_SOFTWARE_CONTROL;
                I915_WRITE(CHICKEN_TRANS(cpu_transcoder), chicken);
-
-               I915_WRITE(EDP_PSR_DEBUG,
-                          EDP_PSR_DEBUG_MASK_MEMUP |
-                          EDP_PSR_DEBUG_MASK_HPD |
-                          EDP_PSR_DEBUG_MASK_LPSP |
-                          EDP_PSR_DEBUG_MASK_MAX_SLEEP |
-                          EDP_PSR_DEBUG_MASK_DISP_REG_WRITE);
-       } else {
-               /*
-                * Per Spec: Avoid continuous PSR exit by masking MEMUP
-                * and HPD. also mask LPSP to avoid dependency on other
-                * drivers that might block runtime_pm besides
-                * preventing  other hw tracking issues now we can rely
-                * on frontbuffer tracking.
-                */
-               I915_WRITE(EDP_PSR_DEBUG,
-                          EDP_PSR_DEBUG_MASK_MEMUP |
-                          EDP_PSR_DEBUG_MASK_HPD |
-                          EDP_PSR_DEBUG_MASK_LPSP |
-                          EDP_PSR_DEBUG_MASK_DISP_REG_WRITE |
-                          EDP_PSR_DEBUG_MASK_MAX_SLEEP);
        }
+
+       /*
+        * Per Spec: Avoid continuous PSR exit by masking MEMUP and HPD also
+        * mask LPSP to avoid dependency on other drivers that might block
+        * runtime_pm besides preventing  other hw tracking issues now we
+        * can rely on frontbuffer tracking.
+        */
+       I915_WRITE(EDP_PSR_DEBUG,
+                  EDP_PSR_DEBUG_MASK_MEMUP |
+                  EDP_PSR_DEBUG_MASK_HPD |
+                  EDP_PSR_DEBUG_MASK_LPSP |
+                  EDP_PSR_DEBUG_MASK_DISP_REG_WRITE |
+                  EDP_PSR_DEBUG_MASK_MAX_SLEEP);
 }
 
 static void intel_psr_enable_locked(struct drm_i915_private *dev_priv,