[PATCH 1/3] drm/i915/psr: drm_WARN_ON when activating disabled PSR

[Hogander, Jouni]

On Wed, 2025-08-20 at 10:19 +0000, Kahola, Mika wrote:
> > -----Original Message-----
> > From: Intel-xe <intel-xe-bounces at lists.freedesktop.org> On Behalf
> > Of Jouni Högander
> > Sent: Friday, 15 August 2025 11.46
> > To: intel-gfx at lists.freedesktop.org; intel-xe at lists.freedesktop.org
> > Cc: Hogander, Jouni <jouni.hogander at intel.com>
> > Subject: [PATCH 1/3] drm/i915/psr: drm_WARN_ON when activating
> > disabled PSR
> > 
> > Add drm_WARN_ON for scenario where PSR is activated while it is
> > disabled.
> > 
> 
> Reviewed-by: Mika Kahola <mika.kahola at intel.com>

Thank you Mika for the review. These are now pushed to drm-intel-next.

BR,

Jouni Högander

> 
> > Signed-off-by: Jouni Högander <jouni.hogander at intel.com>
> > ---
> >  drivers/gpu/drm/i915/display/intel_psr.c | 2 ++
> >  1 file changed, 2 insertions(+)
> > 
> > diff --git a/drivers/gpu/drm/i915/display/intel_psr.c
> > b/drivers/gpu/drm/i915/display/intel_psr.c
> > index 8bea2b8188a7..226d4d1c7c82 100644
> > --- a/drivers/gpu/drm/i915/display/intel_psr.c
> > +++ b/drivers/gpu/drm/i915/display/intel_psr.c
> > @@ -1787,6 +1787,8 @@ static void intel_psr_activate(struct
> > intel_dp *intel_dp)
> > 
> >  	drm_WARN_ON(display->drm, intel_dp->psr.active);
> > 
> > +	drm_WARN_ON(display->drm, !intel_dp->psr.enabled);
> > +
> >  	lockdep_assert_held(&intel_dp->psr.lock);
> > 
> >  	/* psr1, psr2 and panel-replay are mutually exclusive.*/
> > --
> > 2.43.0
>