On Tue, 2022-11-01 at 13:53 +0200, Jouni Högander wrote:
> MTL shares PSR2_MAN_TRK_CTL bits with ADL. Currently some bit
> getter functions are incorrect for MTL. This patch fixes those.
>
> Bspec: 49274
Reviewed-by: José Roberto de Souza <jose.souza@xxxxxxxxx>
>
> Cc: José Roberto de Souza <jose.souza@xxxxxxxxx>
> Cc: Mika Kahola <mika.kahola@xxxxxxxxx>
> Cc: Radhakrishna Sripada <radhakrishna.sripada@xxxxxxxxx>
>
> Fixes: 47d4ae2192cb ("drm/i915/mtl: Extend PSR support")
> Signed-off-by: Jouni Högander <jouni.hogander@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_psr.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
> index 904a1049eff3..4bfb8313738e 100644
> --- a/drivers/gpu/drm/i915/display/intel_psr.c
> +++ b/drivers/gpu/drm/i915/display/intel_psr.c
> @@ -1470,7 +1470,8 @@ void intel_psr_resume(struct intel_dp *intel_dp)
>
> static u32 man_trk_ctl_enable_bit_get(struct drm_i915_private *dev_priv)
> {
> - return IS_ALDERLAKE_P(dev_priv) ? 0 : PSR2_MAN_TRK_CTL_ENABLE;
> + return IS_ALDERLAKE_P(dev_priv) || DISPLAY_VER(dev_priv) >= 14 ? 0 :
> + PSR2_MAN_TRK_CTL_ENABLE;
> }
>
> static u32 man_trk_ctl_single_full_frame_bit_get(struct drm_i915_private *dev_priv)
> @@ -1482,14 +1483,14 @@ static u32 man_trk_ctl_single_full_frame_bit_get(struct drm_i915_private *dev_pr
>
> static u32 man_trk_ctl_partial_frame_bit_get(struct drm_i915_private *dev_priv)
> {
> - return IS_ALDERLAKE_P(dev_priv) ?
> + return IS_ALDERLAKE_P(dev_priv) || DISPLAY_VER(dev_priv) >= 14 ?
> ADLP_PSR2_MAN_TRK_CTL_SF_PARTIAL_FRAME_UPDATE :
> PSR2_MAN_TRK_CTL_SF_PARTIAL_FRAME_UPDATE;
> }
>
> static u32 man_trk_ctl_continuos_full_frame(struct drm_i915_private *dev_priv)
> {
> - return IS_ALDERLAKE_P(dev_priv) ?
> + return IS_ALDERLAKE_P(dev_priv) || DISPLAY_VER(dev_priv) >= 14 ?
> ADLP_PSR2_MAN_TRK_CTL_SF_CONTINUOS_FULL_FRAME :
> PSR2_MAN_TRK_CTL_SF_CONTINUOS_FULL_FRAME;
> }
