[PATCH] drm/i915/psr: Prevent DP Panel Replay as well when CRC is enable

[Hogander, Jouni]

On Tue, 2025-04-01 at 12:25 +0300, Jani Nikula wrote:
> On Mon, 31 Mar 2025, Jouni Högander <jouni.hogander at intel.com> wrote:
> > We are seeing timeouts in opening CRC fd when testing on setup
> > where DP
> > Panel Replay can be enabled. Fix these by checking if CRC is
> > enabled for DP
> > Panel Replay as well.
> > 
> > Signed-off-by: Jouni Högander <jouni.hogander at intel.com>
> 
> Reviewed-by: Jani Nikula <jani.nikula at intel.com>

This is now pushed to drm-intel-next. Thank you Jani for checking my
patch.

BR,

Jouni Högander

> 
> 
> > ---
> >  drivers/gpu/drm/i915/display/intel_psr.c | 12 ++++++------
> >  1 file changed, 6 insertions(+), 6 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/display/intel_psr.c
> > b/drivers/gpu/drm/i915/display/intel_psr.c
> > index c4be3f46511f7..c8cfa27fb043d 100644
> > --- a/drivers/gpu/drm/i915/display/intel_psr.c
> > +++ b/drivers/gpu/drm/i915/display/intel_psr.c
> > @@ -1595,6 +1595,12 @@ _panel_replay_compute_config(struct intel_dp
> > *intel_dp,
> >  		return false;
> >  	}
> >  
> > +	if (crtc_state->crc_enabled) {
> > +		drm_dbg_kms(display->drm,
> > +			    "Panel Replay not enabled because it
> > would inhibit pipe CRC calculation\n");
> > +		return false;
> > +	}
> > +
> >  	if (!intel_dp_is_edp(intel_dp))
> >  		return true;
> >  
> > @@ -1625,12 +1631,6 @@ _panel_replay_compute_config(struct intel_dp
> > *intel_dp,
> >  	if (!alpm_config_valid(intel_dp, crtc_state, true))
> >  		return false;
> >  
> > -	if (crtc_state->crc_enabled) {
> > -		drm_dbg_kms(display->drm,
> > -			    "Panel Replay not enabled because it
> > would inhibit pipe CRC calculation\n");
> > -		return false;
> > -	}
> > -
> >  	return true;
> >  }
>