> -----Original Message-----
> From: Nikula, Jani <jani.nikula@xxxxxxxxx>
> Sent: Monday, February 24, 2025 4:12 PM
> To: Manna, Animesh <animesh.manna@xxxxxxxxx>; intel-
> gfx@xxxxxxxxxxxxxxxxxxxxx; intel-xe@xxxxxxxxxxxxxxxxxxxxx
> Cc: Hogander, Jouni <jouni.hogander@xxxxxxxxx>; B, Jeevan
> <jeevan.b@xxxxxxxxx>; Manna, Animesh <animesh.manna@xxxxxxxxx>
> Subject: Re: [PATCH v4 1/8] drm/i915/lobf: Add lobf enablement in post
> plane update
>
> On Mon, 24 Feb 2025, Animesh Manna <animesh.manna@xxxxxxxxx> wrote:
> > Enablement of LOBF is added in post plane update whenever has_lobf
> > flag is set. As LOBF can be enabled in non-psr case as well so adding
> > in post plane update. There is no change of configuring alpm with psr
> > path.
> >
> > v1: Initial version.
> > v2: Use encoder-mask to find the associated encoder from crtc-state.
> > [Jani]
> > v3: Remove alpm_configure from intel_psr.c. [Jouni]
> >
> > Signed-off-by: Animesh Manna <animesh.manna@xxxxxxxxx>
> > ---
> > drivers/gpu/drm/i915/display/intel_alpm.c | 25 ++++++++++++++++++++
> > drivers/gpu/drm/i915/display/intel_alpm.h | 4 ++++
> > drivers/gpu/drm/i915/display/intel_display.c | 3 +++
> > drivers/gpu/drm/i915/display/intel_psr.c | 3 ---
> > 4 files changed, 32 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/display/intel_alpm.c
> > b/drivers/gpu/drm/i915/display/intel_alpm.c
> > index 55f3ae1e68c9..a53ed83f6b22 100644
> > --- a/drivers/gpu/drm/i915/display/intel_alpm.c
> > +++ b/drivers/gpu/drm/i915/display/intel_alpm.c
> > @@ -367,6 +367,31 @@ void intel_alpm_configure(struct intel_dp
> *intel_dp,
> > lnl_alpm_configure(intel_dp, crtc_state); }
> >
> > +void intel_alpm_post_plane_update(struct intel_atomic_state *state,
> > + struct intel_crtc *crtc)
> > +{
> > + struct intel_display *display = to_intel_display(state);
> > + const struct intel_crtc_state *crtc_state =
> > + intel_atomic_get_new_crtc_state(state, crtc);
> > + struct intel_encoder *encoder;
> > +
> > + if (!(crtc_state->has_lobf || crtc_state->has_psr))
> > + return;
>
> I think this would read better as "if not lobf and not psr" than "if not (lobf or
> psr)" because of the need to verbalize the parens.
Ok.
Regards,
Animesh
>
> > +
> > + for_each_intel_encoder_mask(display->drm, encoder,
> > + crtc_state->uapi.encoder_mask) {
> > + struct intel_dp *intel_dp;
> > +
> > + if (!intel_encoder_is_dp(encoder))
> > + continue;
> > +
> > + intel_dp = enc_to_intel_dp(encoder);
> > +
> > + if (intel_dp_is_edp(intel_dp))
> > + intel_alpm_configure(intel_dp, crtc_state);
> > + }
> > +}
> > +
> > static int i915_edp_lobf_info_show(struct seq_file *m, void *data) {
> > struct intel_connector *connector = m->private; diff --git
> > a/drivers/gpu/drm/i915/display/intel_alpm.h
> > b/drivers/gpu/drm/i915/display/intel_alpm.h
> > index 8c409b10dce6..2f862b0476a8 100644
> > --- a/drivers/gpu/drm/i915/display/intel_alpm.h
> > +++ b/drivers/gpu/drm/i915/display/intel_alpm.h
> > @@ -12,6 +12,8 @@ struct intel_dp;
> > struct intel_crtc_state;
> > struct drm_connector_state;
> > struct intel_connector;
> > +struct intel_atomic_state;
> > +struct intel_crtc;
> >
> > void intel_alpm_init_dpcd(struct intel_dp *intel_dp); bool
> > intel_alpm_compute_params(struct intel_dp *intel_dp, @@ -21,6 +23,8
> @@
> > void intel_alpm_lobf_compute_config(struct intel_dp *intel_dp,
> > struct drm_connector_state *conn_state);
> void
> > intel_alpm_configure(struct intel_dp *intel_dp,
> > const struct intel_crtc_state *crtc_state);
> > +void intel_alpm_post_plane_update(struct intel_atomic_state *state,
> > + struct intel_crtc *crtc);
> > void intel_alpm_lobf_debugfs_add(struct intel_connector *connector);
> > bool intel_alpm_aux_wake_supported(struct intel_dp *intel_dp); bool
> > intel_alpm_aux_less_wake_supported(struct intel_dp *intel_dp); diff
> > --git a/drivers/gpu/drm/i915/display/intel_display.c
> > b/drivers/gpu/drm/i915/display/intel_display.c
> > index 065fdf6dbb88..5d5cee808bff 100644
> > --- a/drivers/gpu/drm/i915/display/intel_display.c
> > +++ b/drivers/gpu/drm/i915/display/intel_display.c
> > @@ -55,6 +55,7 @@
> > #include "i9xx_plane.h"
> > #include "i9xx_plane_regs.h"
> > #include "i9xx_wm.h"
> > +#include "intel_alpm.h"
> > #include "intel_atomic.h"
> > #include "intel_atomic_plane.h"
> > #include "intel_audio.h"
> > @@ -1077,6 +1078,8 @@ static void intel_post_plane_update(struct
> intel_atomic_state *state,
> > intel_atomic_get_new_crtc_state(state, crtc);
> > enum pipe pipe = crtc->pipe;
> >
> > + intel_alpm_post_plane_update(state, crtc);
> > +
> > intel_psr_post_plane_update(state, crtc);
> >
> > intel_frontbuffer_flip(dev_priv, new_crtc_state->fb_bits); diff
> > --git a/drivers/gpu/drm/i915/display/intel_psr.c
> > b/drivers/gpu/drm/i915/display/intel_psr.c
> > index 4e938bad808c..c1dd9c739fd4 100644
> > --- a/drivers/gpu/drm/i915/display/intel_psr.c
> > +++ b/drivers/gpu/drm/i915/display/intel_psr.c
> > @@ -1903,9 +1903,6 @@ static void intel_psr_enable_source(struct
> intel_dp *intel_dp,
> > intel_dp->psr.psr2_sel_fetch_enabled ?
> > IGNORE_PSR2_HW_TRACKING : 0);
> >
> > - if (intel_dp_is_edp(intel_dp))
> > - intel_alpm_configure(intel_dp, crtc_state);
> > -
> > /*
> > * Wa_16013835468
> > * Wa_14015648006
>
> --
> Jani Nikula, Intel
