| Message ID | 20250408060539.4167353-1-jouni.hogander@intel.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | drm/i915/alpm: use variable from intel_crtc_state instead of intel_psr | expand |
> -----Original Message----- > From: Intel-gfx <intel-gfx-bounces@lists.freedesktop.org> On Behalf Of Jouni > Högander > Sent: Tuesday, April 8, 2025 11:36 AM > To: intel-gfx@lists.freedesktop.org; intel-xe@lists.freedesktop.org > Cc: Hogander, Jouni <jouni.hogander@intel.com> > Subject: [PATCH] drm/i915/alpm: use variable from intel_crtc_state instead > of intel_psr > > Currently code is making assumption that PSR is enabled when > intel_alpm_configure is called. This doesn't work if alpm is configured before > PSR is enabled. > > Signed-off-by: Jouni Högander <jouni.hogander@intel.com> LGTM. Reviewed-by: Animesh Manna <animesh.manna@intel.com> > --- > drivers/gpu/drm/i915/display/intel_alpm.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_alpm.c > b/drivers/gpu/drm/i915/display/intel_alpm.c > index eba49263e2fb8..746495ac675be 100644 > --- a/drivers/gpu/drm/i915/display/intel_alpm.c > +++ b/drivers/gpu/drm/i915/display/intel_alpm.c > @@ -317,14 +317,14 @@ static void lnl_alpm_configure(struct intel_dp > *intel_dp, > u32 alpm_ctl; > > if (DISPLAY_VER(display) < 20 || > - (!intel_dp->psr.sel_update_enabled && > !intel_dp_is_edp(intel_dp))) > + (!crtc_state->has_sel_update && !intel_dp_is_edp(intel_dp))) > return; > > /* > * Panel Replay on eDP is always using ALPM aux less. I.e. no need to > * check panel support at this point. > */ > - if ((intel_dp->psr.panel_replay_enabled && > intel_dp_is_edp(intel_dp)) || > + if ((crtc_state->has_panel_replay && intel_dp_is_edp(intel_dp)) || > (crtc_state->has_lobf && > intel_alpm_aux_less_wake_supported(intel_dp))) { > alpm_ctl = ALPM_CTL_ALPM_ENABLE | > ALPM_CTL_ALPM_AUX_LESS_ENABLE | > -- > 2.43.0
diff --git a/drivers/gpu/drm/i915/display/intel_alpm.c b/drivers/gpu/drm/i915/display/intel_alpm.c index eba49263e2fb8..746495ac675be 100644 --- a/drivers/gpu/drm/i915/display/intel_alpm.c +++ b/drivers/gpu/drm/i915/display/intel_alpm.c @@ -317,14 +317,14 @@ static void lnl_alpm_configure(struct intel_dp *intel_dp, u32 alpm_ctl; if (DISPLAY_VER(display) < 20 || - (!intel_dp->psr.sel_update_enabled && !intel_dp_is_edp(intel_dp))) + (!crtc_state->has_sel_update && !intel_dp_is_edp(intel_dp))) return; /* * Panel Replay on eDP is always using ALPM aux less. I.e. no need to * check panel support at this point. */ - if ((intel_dp->psr.panel_replay_enabled && intel_dp_is_edp(intel_dp)) || + if ((crtc_state->has_panel_replay && intel_dp_is_edp(intel_dp)) || (crtc_state->has_lobf && intel_alpm_aux_less_wake_supported(intel_dp))) { alpm_ctl = ALPM_CTL_ALPM_ENABLE | ALPM_CTL_ALPM_AUX_LESS_ENABLE |
Currently code is making assumption that PSR is enabled when intel_alpm_configure is called. This doesn't work if alpm is configured before PSR is enabled. Signed-off-by: Jouni Högander <jouni.hogander@intel.com> --- drivers/gpu/drm/i915/display/intel_alpm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)