> -----Original Message-----
> From: Hogander, Jouni <jouni.hogander@xxxxxxxxx>
> Sent: Friday, January 19, 2024 3:40 PM
> To: intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> Cc: Manna, Animesh <animesh.manna@xxxxxxxxx>; Hogander, Jouni
> <jouni.hogander@xxxxxxxxx>
> Subject: [PATCH v3 08/21] drm/i915/psr: Unify panel replay enable/disable
> sink
>
> Unify enabling and disabling of psr/panel replay for a sink. Modify
> intel_psr_enable_sink accordingly and use it for both cases.
>
> v2:
> - enable panel replay for sink before link training
> - write ALPM_CONFIG only for PSR
> - add DP_PSR_CRC_VERIFICATION only for PSR
> - take care of disable sink as well
>
> Signed-off-by: Jouni Högander <jouni.hogander@xxxxxxxxx>
LGTM.
Reviewed-by: Animesh Manna <animesh.manna@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_ddi.c | 11 +++--
> drivers/gpu/drm/i915/display/intel_psr.c | 54 +++++++++++++++++-------
> drivers/gpu/drm/i915/display/intel_psr.h | 2 +
> 3 files changed, 46 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c
> b/drivers/gpu/drm/i915/display/intel_ddi.c
> index 922194b957be..6721a478a633 100644
> --- a/drivers/gpu/drm/i915/display/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/display/intel_ddi.c
> @@ -2800,15 +2800,14 @@ static void intel_ddi_pre_enable_dp(struct
> intel_atomic_state *state,
> const struct drm_connector_state
> *conn_state) {
> struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
> - struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
>
> - if (HAS_DP20(dev_priv)) {
> + if (HAS_DP20(dev_priv))
> intel_dp_128b132b_sdp_crc16(enc_to_intel_dp(encoder),
> crtc_state);
> - if (crtc_state->has_panel_replay)
> - drm_dp_dpcd_writeb(&intel_dp->aux,
> PANEL_REPLAY_CONFIG,
> - DP_PANEL_REPLAY_ENABLE);
> - }
> +
> + /* Panel replay has to be enabled in sink dpcd before link training. */
> + if (crtc_state->has_panel_replay)
> + intel_psr_enable_sink(enc_to_intel_dp(encoder), crtc_state);
>
> if (DISPLAY_VER(dev_priv) >= 14)
> mtl_ddi_pre_enable_dp(state, encoder, crtc_state,
> conn_state); diff --git a/drivers/gpu/drm/i915/display/intel_psr.c
> b/drivers/gpu/drm/i915/display/intel_psr.c
> index 2d5d1c2ce246..b905aee0ec81 100644
> --- a/drivers/gpu/drm/i915/display/intel_psr.c
> +++ b/drivers/gpu/drm/i915/display/intel_psr.c
> @@ -638,19 +638,29 @@ static bool psr2_su_region_et_valid(struct intel_dp
> *intel_dp)
> return false;
> }
>
> -static void intel_psr_enable_sink(struct intel_dp *intel_dp)
> +static unsigned int intel_psr_get_enable_sink_offset(struct intel_dp
> +*intel_dp) {
> + return intel_dp->psr.panel_replay_enabled ?
> + PANEL_REPLAY_CONFIG : DP_PSR_EN_CFG;
> +}
> +
> +/*
> + * Note: Most of the bits are same in PANEL_REPLAY_CONFIG and
> +DP_PSR_EN_CFG. We
> + * are relying on PSR definitions on these "common" bits.
> + */
> +void intel_psr_enable_sink(struct intel_dp *intel_dp,
> + const struct intel_crtc_state *crtc_state)
> {
> struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
> u8 dpcd_val = DP_PSR_ENABLE;
>
> - if (intel_dp->psr.panel_replay_enabled)
> - return;
> -
> - if (intel_dp->psr.psr2_enabled) {
> + if (crtc_state->has_psr2) {
> /* Enable ALPM at sink for psr2 */
> - drm_dp_dpcd_writeb(&intel_dp->aux,
> DP_RECEIVER_ALPM_CONFIG,
> - DP_ALPM_ENABLE |
> -
> DP_ALPM_LOCK_ERROR_IRQ_HPD_ENABLE);
> + if (!crtc_state->has_panel_replay)
> + drm_dp_dpcd_writeb(&intel_dp->aux,
> + DP_RECEIVER_ALPM_CONFIG,
> + DP_ALPM_ENABLE |
> +
> DP_ALPM_LOCK_ERROR_IRQ_HPD_ENABLE);
>
> dpcd_val |= DP_PSR_ENABLE_PSR2 |
> DP_PSR_IRQ_HPD_WITH_CRC_ERRORS;
> if (psr2_su_region_et_valid(intel_dp))
> @@ -659,19 +669,26 @@ static void intel_psr_enable_sink(struct intel_dp
> *intel_dp)
> if (intel_dp->psr.link_standby)
> dpcd_val |= DP_PSR_MAIN_LINK_ACTIVE;
>
> - if (DISPLAY_VER(dev_priv) >= 8)
> + if (!crtc_state->has_panel_replay && DISPLAY_VER(dev_priv)
> >= 8)
> dpcd_val |= DP_PSR_CRC_VERIFICATION;
> }
>
> - if (intel_dp->psr.req_psr2_sdp_prior_scanline)
> + if (crtc_state->has_panel_replay)
> + dpcd_val |=
> DP_PANEL_REPLAY_UNRECOVERABLE_ERROR_EN |
> + DP_PANEL_REPLAY_RFB_STORAGE_ERROR_EN;
> +
> + if (crtc_state->req_psr2_sdp_prior_scanline)
> dpcd_val |= DP_PSR_SU_REGION_SCANLINE_CAPTURE;
>
> if (intel_dp->psr.entry_setup_frames > 0)
> dpcd_val |= DP_PSR_FRAME_CAPTURE;
>
> - drm_dp_dpcd_writeb(&intel_dp->aux, DP_PSR_EN_CFG, dpcd_val);
> + drm_dp_dpcd_writeb(&intel_dp->aux,
> + intel_psr_get_enable_sink_offset(intel_dp),
> + dpcd_val);
>
> - drm_dp_dpcd_writeb(&intel_dp->aux, DP_SET_POWER,
> DP_SET_POWER_D0);
> + if (intel_dp_is_edp(intel_dp))
> + drm_dp_dpcd_writeb(&intel_dp->aux, DP_SET_POWER,
> DP_SET_POWER_D0);
> }
>
> static u32 intel_psr1_get_tp_time(struct intel_dp *intel_dp) @@ -1701,9
> +1718,14 @@ static void intel_psr_enable_locked(struct intel_dp *intel_dp,
> intel_dp->psr.psr2_enabled ? "2" : "1");
>
> intel_snps_phy_update_psr_power_state(dev_priv, phy,
> true);
> +
> + /*
> + * Panel replay has to be enabled before link training: doing it
> + * only for PSR here.
> + */
> + intel_psr_enable_sink(intel_dp, crtc_state);
> }
>
> - intel_psr_enable_sink(intel_dp);
> intel_psr_enable_source(intel_dp, crtc_state);
> intel_dp->psr.enabled = true;
> intel_dp->psr.paused = false;
> @@ -1813,9 +1835,11 @@ static void intel_psr_disable_locked(struct
> intel_dp *intel_dp)
> intel_snps_phy_update_psr_power_state(dev_priv, phy,
> false);
>
> /* Disable PSR on Sink */
> - drm_dp_dpcd_writeb(&intel_dp->aux, DP_PSR_EN_CFG, 0);
> + drm_dp_dpcd_writeb(&intel_dp->aux,
> + intel_psr_get_enable_sink_offset(intel_dp), 0);
>
> - if (intel_dp->psr.psr2_enabled)
> + if (!intel_dp->psr.panel_replay_enabled &&
> + intel_dp->psr.psr2_enabled)
> drm_dp_dpcd_writeb(&intel_dp->aux,
> DP_RECEIVER_ALPM_CONFIG, 0);
>
> intel_dp->psr.enabled = false;
> diff --git a/drivers/gpu/drm/i915/display/intel_psr.h
> b/drivers/gpu/drm/i915/display/intel_psr.h
> index f7c5cc07864f..b74382b38f4a 100644
> --- a/drivers/gpu/drm/i915/display/intel_psr.h
> +++ b/drivers/gpu/drm/i915/display/intel_psr.h
> @@ -23,6 +23,8 @@ struct intel_plane_state;
>
> bool intel_encoder_can_psr(struct intel_encoder *encoder); void
> intel_psr_init_dpcd(struct intel_dp *intel_dp);
> +void intel_psr_enable_sink(struct intel_dp *intel_dp,
> + const struct intel_crtc_state *crtc_state);
> void intel_psr_pre_plane_update(struct intel_atomic_state *state,
> struct intel_crtc *crtc);
> void intel_psr_post_plane_update(struct intel_atomic_state *state,
> --
> 2.34.1
