From: "Hogander, Jouni" <jouni.hogander@intel.com>
To: "Kandpal, Suraj" <suraj.kandpal@intel.com>,
"intel-xe@lists.freedesktop.org" <intel-xe@lists.freedesktop.org>,
"intel-gfx@lists.freedesktop.org"
<intel-gfx@lists.freedesktop.org>
Subject: Re: [PATCH] drm/i915/psr: Fix drm_WARN_ON in intel_psr_disable
Date: Fri, 14 Feb 2025 07:31:22 +0000 [thread overview]
Message-ID: <6935c062ca74b347064f260787c2ac6c46dfd5cb.camel@intel.com> (raw)
In-Reply-To: <SN7PR11MB67505CB0547E75F422B24B92E3FE2@SN7PR11MB6750.namprd11.prod.outlook.com>
On Fri, 2025-02-14 at 04:27 +0000, Kandpal, Suraj wrote:
>
>
> > -----Original Message-----
> > From: Intel-xe <intel-xe-bounces@lists.freedesktop.org> On Behalf
> > Of Jouni
> > Högander
> > Sent: Thursday, February 13, 2025 4:46 PM
> > To: intel-gfx@lists.freedesktop.org; intel-xe@lists.freedesktop.org
> > Cc: Hogander, Jouni <jouni.hogander@intel.com>
> > Subject: [PATCH] drm/i915/psr: Fix drm_WARN_ON in intel_psr_disable
> >
> > Currently intel_psr_disable is dumping out warning if PSR is not
> > supported. On
> > monitor supporting only Panel Replay we are seeing this warning.
> > Fix this by
> > checking Panel Replay support as well.
>
> LGTM,
> Reviewed-by: Suraj Kandpal <suraj.kandpal@intel.com>
Thank you very much Suraj.
>
> Note: Should we be looking into separating the code for panel replay
> and psr with functions being
> Shared between the two files ? Will make going through the code much
> easier. Just wondering if that
> Makes sense in the future >
I'm not yet buying this idea as they share so much. I have been
thinking adding helpers for the purpose related to problem fixed in
this patch:
has_psr() // psr1, psr2, panel replay
has_psr1()
has_psr2()
has_panel_replay()
that would ease readability. What do you think?
BR,
Jouni Högander
>
> >
> > Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
> > ---
> > drivers/gpu/drm/i915/display/intel_psr.c | 3 ++-
> > 1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/i915/display/intel_psr.c
> > b/drivers/gpu/drm/i915/display/intel_psr.c
> > index 861e50ceef85..c77eb1ba3db3 100644
> > --- a/drivers/gpu/drm/i915/display/intel_psr.c
> > +++ b/drivers/gpu/drm/i915/display/intel_psr.c
> > @@ -2186,7 +2186,8 @@ void intel_psr_disable(struct intel_dp
> > *intel_dp,
> > if (!old_crtc_state->has_psr)
> > return;
> >
> > - if (drm_WARN_ON(display->drm, !CAN_PSR(intel_dp)))
> > + if (drm_WARN_ON(display->drm, !CAN_PSR(intel_dp) &&
> > + !CAN_PANEL_REPLAY(intel_dp))
> )
> > return;
> >
> > mutex_lock(&intel_dp->psr.lock);
> > --
> > 2.43.0
>
next prev parent reply other threads:[~2025-02-14 7:31 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-13 11:16 [PATCH] drm/i915/psr: Fix drm_WARN_ON in intel_psr_disable Jouni Högander
2025-02-13 11:21 ` ✓ CI.Patch_applied: success for " Patchwork
2025-02-13 11:21 ` ✓ CI.checkpatch: " Patchwork
2025-02-13 11:23 ` ✓ CI.KUnit: " Patchwork
2025-02-13 11:39 ` ✓ CI.Build: " Patchwork
2025-02-13 11:41 ` ✓ CI.Hooks: " Patchwork
2025-02-13 11:43 ` ✓ CI.checksparse: " Patchwork
2025-02-13 12:03 ` ✓ Xe.CI.BAT: " Patchwork
2025-02-13 12:14 ` ✓ i915.CI.BAT: " Patchwork
2025-02-13 19:31 ` ✗ i915.CI.Full: failure " Patchwork
2025-02-19 11:53 ` Hogander, Jouni
2025-02-14 3:36 ` ✗ Xe.CI.Full: " Patchwork
2025-02-19 11:58 ` Hogander, Jouni
2025-02-14 4:27 ` [PATCH] " Kandpal, Suraj
2025-02-14 7:31 ` Hogander, Jouni [this message]
2025-02-14 10:56 ` Kandpal, Suraj
2025-02-19 12:09 ` Hogander, Jouni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6935c062ca74b347064f260787c2ac6c46dfd5cb.camel@intel.com \
--to=jouni.hogander@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=intel-xe@lists.freedesktop.org \
--cc=suraj.kandpal@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.