Issue is seen when PSR enabled with setup frames and when try to disable
PSR at SRDONACK State (0x1). PSR FSM is stuck at SRDONACK(0x1) for more
than 5 seconds. Issue not seen with Setup frames disabled. Currently
disable psr1 if setuptime > vblank to workaround the above issue.

HSD: 16024594674

Signed-off-by: Animesh Manna <animesh.ma...@intel.com>
---
 drivers/gpu/drm/i915/display/intel_psr.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/drivers/gpu/drm/i915/display/intel_psr.c 
b/drivers/gpu/drm/i915/display/intel_psr.c
index 4176163ec19a..887fa8a8f878 100644
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -1640,6 +1640,15 @@ _panel_replay_compute_config(struct intel_dp *intel_dp,
        return true;
 }
 
+static bool intel_psr_needs_wa_18037818876(struct intel_dp *intel_dp,
+                                          struct intel_crtc_state *crtc_state)
+{
+       struct intel_display *display = to_intel_display(intel_dp);
+
+       return ((DISPLAY_VER(display) == 20) && 
intel_dp->psr.entry_setup_frames > 0 &&
+               !crtc_state->has_sel_update);
+}
+
 void intel_psr_compute_config(struct intel_dp *intel_dp,
                              struct intel_crtc_state *crtc_state,
                              struct drm_connector_state *conn_state)
@@ -1686,6 +1695,10 @@ void intel_psr_compute_config(struct intel_dp *intel_dp,
                return;
 
        crtc_state->has_sel_update = intel_sel_update_config_valid(intel_dp, 
crtc_state);
+
+       /* Wa_18037818876 */
+       if (intel_psr_needs_wa_18037818876(intel_dp, crtc_state))
+               crtc_state->has_psr = false;
 }
 
 void intel_psr_get_config(struct intel_encoder *encoder,
-- 
2.29.0

Reply via email to