On Mon, 2025-01-06 at 09:45 +0530, Animesh Manna wrote: > For every commit the dependent condition for LOBF is checked > and accordingly update has_lobf flag which will be used > to update the ALPM_CTL register during commit. > > Signed-off-by: Animesh Manna <[email protected]> > --- > drivers/gpu/drm/i915/display/intel_alpm.c | 16 ++++++++++++++++ > drivers/gpu/drm/i915/display/intel_alpm.h | 1 + > drivers/gpu/drm/i915/display/intel_ddi.c | 2 ++ > 3 files changed, 19 insertions(+) > > diff --git a/drivers/gpu/drm/i915/display/intel_alpm.c > b/drivers/gpu/drm/i915/display/intel_alpm.c > index f31f94a9c99a..197c67363f0e 100644 > --- a/drivers/gpu/drm/i915/display/intel_alpm.c > +++ b/drivers/gpu/drm/i915/display/intel_alpm.c > @@ -312,6 +312,22 @@ void intel_alpm_lobf_compute_config(struct > intel_dp *intel_dp, > (first_sdp_position + waketime_in_lines); > } > > +void intel_alpm_lobf_update(const struct intel_crtc_state > *crtc_state) > +{ > + struct intel_display *display = > to_intel_display(crtc_state); > + enum transcoder cpu_transcoder = crtc_state->cpu_transcoder; > + u32 alpm_ctl; > + > + if (DISPLAY_VER(display) < 20) > + return; > + > + alpm_ctl = intel_de_read(display, ALPM_CTL(display, > cpu_transcoder)); > + if (alpm_ctl & ALPM_CTL_LOBF_ENABLE && !crtc_state- > >has_lobf) { > + alpm_ctl &= ~ALPM_CTL_LOBF_ENABLE; > + intel_de_write(display, ALPM_CTL(display, > cpu_transcoder), alpm_ctl); > + } > +} > + > static void lnl_alpm_configure(struct intel_dp *intel_dp, > const struct intel_crtc_state > *crtc_state) > { > diff --git a/drivers/gpu/drm/i915/display/intel_alpm.h > b/drivers/gpu/drm/i915/display/intel_alpm.h > index 2f862b0476a8..485e511629fb 100644 > --- a/drivers/gpu/drm/i915/display/intel_alpm.h > +++ b/drivers/gpu/drm/i915/display/intel_alpm.h > @@ -23,6 +23,7 @@ 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_lobf_update(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); > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c > b/drivers/gpu/drm/i915/display/intel_ddi.c > index 36aaa82f4536..cfdbe8013db6 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi.c > +++ b/drivers/gpu/drm/i915/display/intel_ddi.c > @@ -35,6 +35,7 @@ > #include "i915_reg.h" > #include "icl_dsi.h" > #include "intel_audio.h" > +#include "intel_alpm.h" > #include "intel_audio_regs.h" > #include "intel_backlight.h" > #include "intel_combo_phy.h" > @@ -3543,6 +3544,7 @@ static void intel_ddi_update_pipe_dp(struct > intel_atomic_state *state, > intel_ddi_set_dp_msa(crtc_state, conn_state); > > intel_dp_set_infoframes(encoder, true, crtc_state, > conn_state); > + intel_alpm_lobf_update(crtc_state);
I think intel_alpm_configure should take care of setting LOBF enable bit based on crtc_state. Then remove call to intel_alpm_configure from intel_psr.c::intel_psr_enable_source and place it such that it get's called before PSR/PR gets enabled and also for LOBF usage. intel_psr.c::intel_psr_disable_locked should stop touching *ALPM_CTL_* registers. Would this work for you? BR, Jouni Högander > > intel_backlight_update(state, encoder, crtc_state, > conn_state); > drm_connector_update_privacy_screen(conn_state);
