Commit 54599011 authored by Jouni Högander's avatar Jouni Högander

drm/i915/psr: Do not apply workarounds in case of panel replay

There are some workarounds that are not applicable for panel replay. Do not
apply these if panel replay is used.

Bspec: 66624, 50422
Signed-off-by: default avatarJouni Högander <jouni.hogander@intel.com>
Reviewed-by: default avatarAnimesh Manna <animesh.manna@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240510093823.3146455-10-jouni.hogander@intel.com
parent 29fb595d
...@@ -1251,7 +1251,8 @@ static int intel_fbc_check_plane(struct intel_atomic_state *state, ...@@ -1251,7 +1251,8 @@ static int intel_fbc_check_plane(struct intel_atomic_state *state,
* Recommendation is to keep this combination disabled * Recommendation is to keep this combination disabled
* Bspec: 50422 HSD: 14010260002 * Bspec: 50422 HSD: 14010260002
*/ */
if (IS_DISPLAY_VER(i915, 12, 14) && crtc_state->has_sel_update) { if (IS_DISPLAY_VER(i915, 12, 14) && crtc_state->has_sel_update &&
!crtc_state->has_panel_replay) {
plane_state->no_fbc_reason = "PSR2 enabled"; plane_state->no_fbc_reason = "PSR2 enabled";
return 0; return 0;
} }
...@@ -1259,7 +1260,7 @@ static int intel_fbc_check_plane(struct intel_atomic_state *state, ...@@ -1259,7 +1260,7 @@ static int intel_fbc_check_plane(struct intel_atomic_state *state,
/* Wa_14016291713 */ /* Wa_14016291713 */
if ((IS_DISPLAY_VER(i915, 12, 13) || if ((IS_DISPLAY_VER(i915, 12, 13) ||
IS_DISPLAY_IP_STEP(i915, IP_VER(14, 0), STEP_A0, STEP_C0)) && IS_DISPLAY_IP_STEP(i915, IP_VER(14, 0), STEP_A0, STEP_C0)) &&
crtc_state->has_psr) { crtc_state->has_psr && !crtc_state->has_panel_replay) {
plane_state->no_fbc_reason = "PSR1 enabled (Wa_14016291713)"; plane_state->no_fbc_reason = "PSR1 enabled (Wa_14016291713)";
return 0; return 0;
} }
......
...@@ -532,7 +532,8 @@ void hsw_write_infoframe(struct intel_encoder *encoder, ...@@ -532,7 +532,8 @@ void hsw_write_infoframe(struct intel_encoder *encoder,
0); 0);
/* Wa_14013475917 */ /* Wa_14013475917 */
if (!(IS_DISPLAY_VER(dev_priv, 13, 14) && crtc_state->has_psr && type == DP_SDP_VSC)) if (!(IS_DISPLAY_VER(dev_priv, 13, 14) && crtc_state->has_psr &&
!crtc_state->has_panel_replay && type == DP_SDP_VSC))
val |= hsw_infoframe_enable(type); val |= hsw_infoframe_enable(type);
if (type == DP_SDP_VSC) if (type == DP_SDP_VSC)
......
...@@ -1970,13 +1970,15 @@ static void intel_psr_enable_source(struct intel_dp *intel_dp, ...@@ -1970,13 +1970,15 @@ static void intel_psr_enable_source(struct intel_dp *intel_dp,
* All supported adlp panels have 1-based X granularity, this may * All supported adlp panels have 1-based X granularity, this may
* cause issues if non-supported panels are used. * cause issues if non-supported panels are used.
*/ */
if (IS_DISPLAY_IP_STEP(dev_priv, IP_VER(14, 0), STEP_A0, STEP_B0) || if (!intel_dp->psr.panel_replay_enabled &&
IS_ALDERLAKE_P(dev_priv)) (IS_DISPLAY_IP_STEP(dev_priv, IP_VER(14, 0), STEP_A0, STEP_B0) ||
IS_ALDERLAKE_P(dev_priv)))
intel_de_rmw(dev_priv, hsw_chicken_trans_reg(dev_priv, cpu_transcoder), intel_de_rmw(dev_priv, hsw_chicken_trans_reg(dev_priv, cpu_transcoder),
0, ADLP_1_BASED_X_GRANULARITY); 0, ADLP_1_BASED_X_GRANULARITY);
/* Wa_16012604467:adlp,mtl[a0,b0] */ /* Wa_16012604467:adlp,mtl[a0,b0] */
if (IS_DISPLAY_IP_STEP(dev_priv, IP_VER(14, 0), STEP_A0, STEP_B0)) if (!intel_dp->psr.panel_replay_enabled &&
IS_DISPLAY_IP_STEP(dev_priv, IP_VER(14, 0), STEP_A0, STEP_B0))
intel_de_rmw(dev_priv, intel_de_rmw(dev_priv,
MTL_CLKGATE_DIS_TRANS(cpu_transcoder), 0, MTL_CLKGATE_DIS_TRANS(cpu_transcoder), 0,
MTL_CLKGATE_DIS_TRANS_DMASC_GATING_DIS); MTL_CLKGATE_DIS_TRANS_DMASC_GATING_DIS);
...@@ -2155,7 +2157,8 @@ static void intel_psr_disable_locked(struct intel_dp *intel_dp) ...@@ -2155,7 +2157,8 @@ static void intel_psr_disable_locked(struct intel_dp *intel_dp)
if (intel_dp->psr.sel_update_enabled) { if (intel_dp->psr.sel_update_enabled) {
/* Wa_16012604467:adlp,mtl[a0,b0] */ /* Wa_16012604467:adlp,mtl[a0,b0] */
if (IS_DISPLAY_IP_STEP(dev_priv, IP_VER(14, 0), STEP_A0, STEP_B0)) if (!intel_dp->psr.panel_replay_enabled &&
IS_DISPLAY_IP_STEP(dev_priv, IP_VER(14, 0), STEP_A0, STEP_B0))
intel_de_rmw(dev_priv, intel_de_rmw(dev_priv,
MTL_CLKGATE_DIS_TRANS(cpu_transcoder), MTL_CLKGATE_DIS_TRANS(cpu_transcoder),
MTL_CLKGATE_DIS_TRANS_DMASC_GATING_DIS, 0); MTL_CLKGATE_DIS_TRANS_DMASC_GATING_DIS, 0);
...@@ -2642,8 +2645,9 @@ int intel_psr2_sel_fetch_update(struct intel_atomic_state *state, ...@@ -2642,8 +2645,9 @@ int intel_psr2_sel_fetch_update(struct intel_atomic_state *state,
goto skip_sel_fetch_set_loop; goto skip_sel_fetch_set_loop;
/* Wa_14014971492 */ /* Wa_14014971492 */
if ((IS_DISPLAY_IP_STEP(dev_priv, IP_VER(14, 0), STEP_A0, STEP_B0) || if (!crtc_state->has_panel_replay &&
IS_ALDERLAKE_P(dev_priv) || IS_TIGERLAKE(dev_priv)) && ((IS_DISPLAY_IP_STEP(dev_priv, IP_VER(14, 0), STEP_A0, STEP_B0) ||
IS_ALDERLAKE_P(dev_priv) || IS_TIGERLAKE(dev_priv))) &&
crtc_state->splitter.enable) crtc_state->splitter.enable)
crtc_state->psr2_su_area.y1 = 0; crtc_state->psr2_su_area.y1 = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment