[PATCH 01/12] drm/i915/psr: Disable panel replay for now

[Jouni Högander]

Panel replay is not completely validated yet. Let's disable it for now.

Signed-off-by: Jouni Högander <jouni.hogan...@intel.com>
---
 .../gpu/drm/i915/display/intel_display_types.h    | 15 ++++++++-------
 drivers/gpu/drm/i915/display/intel_psr.c          | 10 +++++++++-
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h 
b/drivers/gpu/drm/i915/display/intel_display_types.h
index b9b9d9f2bc0b..ec36f7c72dcd 100644
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -1681,13 +1681,14 @@ struct intel_psr {
        /* Mutex for PSR state of the transcoder */
        struct mutex lock;
 
-#define I915_PSR_DEBUG_MODE_MASK       0x0f
-#define I915_PSR_DEBUG_DEFAULT         0x00
-#define I915_PSR_DEBUG_DISABLE         0x01
-#define I915_PSR_DEBUG_ENABLE          0x02
-#define I915_PSR_DEBUG_FORCE_PSR1      0x03
-#define I915_PSR_DEBUG_ENABLE_SEL_FETCH        0x4
-#define I915_PSR_DEBUG_IRQ             0x10
+#define I915_PSR_DEBUG_MODE_MASK               0x0f
+#define I915_PSR_DEBUG_DEFAULT                 0x00
+#define I915_PSR_DEBUG_DISABLE                 0x01
+#define I915_PSR_DEBUG_ENABLE                  0x02
+#define I915_PSR_DEBUG_FORCE_PSR1              0x03
+#define I915_PSR_DEBUG_ENABLE_SEL_FETCH                0x4
+#define I915_PSR_DEBUG_IRQ                     0x10
+#define I915_PSR_DEBUG_PANEL_REPLAY_DISABLE    0x20
 
        u32 debug;
        bool sink_support;
diff --git a/drivers/gpu/drm/i915/display/intel_psr.c 
b/drivers/gpu/drm/i915/display/intel_psr.c
index 494d08817d71..fc1b068755db 100644
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -214,6 +214,11 @@ static bool psr2_global_enabled(struct intel_dp *intel_dp)
        }
 }
 
+static bool panel_replay_global_enabled(struct intel_dp *intel_dp)
+{
+       return !(intel_dp->psr.debug & I915_PSR_DEBUG_PANEL_REPLAY_DISABLE);
+}
+
 static u32 psr_irq_psr_error_bit_get(struct intel_dp *intel_dp)
 {
        struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
@@ -1366,7 +1371,7 @@ void intel_psr_compute_config(struct intel_dp *intel_dp,
        }
 
        if (CAN_PANEL_REPLAY(intel_dp))
-               crtc_state->has_panel_replay = true;
+               crtc_state->has_panel_replay = 
panel_replay_global_enabled(intel_dp);
        else
                crtc_state->has_psr = _psr_compute_config(intel_dp, crtc_state);
 
@@ -2780,6 +2785,9 @@ void intel_psr_init(struct intel_dp *intel_dp)
        else
                intel_dp->psr.source_support = true;
 
+       /* Disable panel replay for now */
+       intel_dp->psr.debug |= I915_PSR_DEBUG_PANEL_REPLAY_DISABLE;
+
        /* Set link_standby x link_off defaults */
        if (DISPLAY_VER(dev_priv) < 12)
                /* For new platforms up to TGL let's respect VBT back again */
-- 
2.34.1