drm/i915/psr: Remove wait_for_idle() for PSR2

CI runs show PSR2 does not go to IDLE with selective update enabled on
all PSR exit triggers. Specifically, logs indicate the hardware enters
"SLEEP Selective Update" and not "IDLE Reset state', like the kernel
expects, when vblank interrupts are enabled. This check was added for PSR1
but incorrectly extended to PSR2, remove the check as it breaks tests
and prints out misleading error messages.

v2: Split out non-code changes (Rodrigo)

Cc: Tarun Vyas <tarun.vyas@intel.com>
Cc: José Roberto de Souza <jose.souza@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Fixes: c43dbcbbcc8c ("drm/i915/psr: Lockless version of psr_wait_for_idle")
Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180824230844.12428-1-dhinakaran.pandiyan@intel.com

diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c
index da583a45e942580720357d00a8e40d1f2ca85823..2cb931f3019b4ee442879c9dea54675e945cb5de 100644 (file)
--- a/drivers/gpu/drm/i915/intel_psr.c
+++ b/drivers/gpu/drm/i915/intel_psr.c
@@ -771,8 +771,6 @@ int intel_psr_wait_for_idle(const struct intel_crtc_state *new_crtc_state,
 {
        struct intel_crtc *crtc = to_intel_crtc(new_crtc_state->base.crtc);
        struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
-       i915_reg_t reg;
-       u32 mask;
 
        if (!dev_priv->psr.enabled || !new_crtc_state->has_psr)
                return 0;
@@ -787,13 +785,10 @@ int intel_psr_wait_for_idle(const struct intel_crtc_state *new_crtc_state,
         * not needed and will induce latencies in the atomic
         * update path.
         */
-       if (dev_priv->psr.psr2_enabled) {
-               reg = EDP_PSR2_STATUS;
-               mask = EDP_PSR2_STATUS_STATE_MASK;
-       } else {
-               reg = EDP_PSR_STATUS;
-               mask = EDP_PSR_STATUS_STATE_MASK;
-       }
+
+       /* FIXME: Update this for PSR2 if we need to wait for idle */
+       if (READ_ONCE(dev_priv->psr.psr2_enabled))
+               return 0;
 
        /*
         * Max time for PSR to idle = Inverse of the refresh rate +
@@ -801,7 +796,8 @@ int intel_psr_wait_for_idle(const struct intel_crtc_state *new_crtc_state,
         * handshake. 50 msec is defesive enough to cover everything.
         */
 
-       return __intel_wait_for_register(dev_priv, reg, mask,
+       return __intel_wait_for_register(dev_priv, EDP_PSR_STATUS,
+                                        EDP_PSR_STATUS_STATE_MASK,
                                         EDP_PSR_STATUS_STATE_IDLE, 2, 50,
                                         out_value);
 }