> -----Original Message----- > From: Intel-gfx <intel-gfx-bounces@xxxxxxxxxxxxxxxxxxxxx> On Behalf Of Jouni > Högander > Sent: Wednesday, January 10, 2024 6:43 PM > To: intel-gfx@xxxxxxxxxxxxxxxxxxxxx > Subject: [PATCH v2 06/13] drm/i915/psr: Rename psr2_enabled as > sel_update_enabled > > We are about to reuse psr2_enabled for panel replay as well. Rename it as > sel_update_enabled to avoid confusion. > > Signed-off-by: Jouni Högander <jouni.hogander@xxxxxxxxx> Changes looks good to me. Reviewed-by: Animesh Manna <animesh.manna@xxxxxxxxx> > --- > .../drm/i915/display/intel_display_types.h | 2 +- > drivers/gpu/drm/i915/display/intel_psr.c | 52 +++++++++---------- > 2 files changed, 27 insertions(+), 27 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h > b/drivers/gpu/drm/i915/display/intel_display_types.h > index 8fdab2f0c546..8315ec307d5f 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_types.h > +++ b/drivers/gpu/drm/i915/display/intel_display_types.h > @@ -1706,7 +1706,7 @@ struct intel_psr { > unsigned int busy_frontbuffer_bits; > bool sink_psr2_support; > bool link_standby; > - bool psr2_enabled; > + bool sel_update_enabled; > bool psr2_sel_fetch_enabled; > bool psr2_sel_fetch_cff_enabled; > bool req_psr2_sdp_prior_scanline; > diff --git a/drivers/gpu/drm/i915/display/intel_psr.c > b/drivers/gpu/drm/i915/display/intel_psr.c > index 3d00b4e396de..cde95cc9925a 100644 > --- a/drivers/gpu/drm/i915/display/intel_psr.c > +++ b/drivers/gpu/drm/i915/display/intel_psr.c > @@ -339,12 +339,12 @@ static void psr_irq_control(struct intel_dp > *intel_dp) } > > static void psr_event_print(struct drm_i915_private *i915, > - u32 val, bool psr2_enabled) > + u32 val, bool sel_update_enabled) > { > drm_dbg_kms(&i915->drm, "PSR exit events: 0x%x\n", val); > if (val & PSR_EVENT_PSR2_WD_TIMER_EXPIRE) > drm_dbg_kms(&i915->drm, "\tPSR2 watchdog timer > expired\n"); > - if ((val & PSR_EVENT_PSR2_DISABLED) && psr2_enabled) > + if ((val & PSR_EVENT_PSR2_DISABLED) && sel_update_enabled) > drm_dbg_kms(&i915->drm, "\tPSR2 disabled\n"); > if (val & PSR_EVENT_SU_DIRTY_FIFO_UNDERRUN) > drm_dbg_kms(&i915->drm, "\tSU dirty FIFO underrun\n"); > @@ -372,7 +372,7 @@ static void psr_event_print(struct drm_i915_private > *i915, > drm_dbg_kms(&i915->drm, "\tVBI enabled\n"); > if (val & PSR_EVENT_LPSP_MODE_EXIT) > drm_dbg_kms(&i915->drm, "\tLPSP mode exited\n"); > - if ((val & PSR_EVENT_PSR_DISABLE) && !psr2_enabled) > + if ((val & PSR_EVENT_PSR_DISABLE) && !sel_update_enabled) > drm_dbg_kms(&i915->drm, "\tPSR disabled\n"); } > > @@ -400,7 +400,7 @@ void intel_psr_irq_handler(struct intel_dp *intel_dp, > u32 psr_iir) > > val = intel_de_rmw(dev_priv, > PSR_EVENT(cpu_transcoder), 0, 0); > > - psr_event_print(dev_priv, val, intel_dp- > >psr.psr2_enabled); > + psr_event_print(dev_priv, val, intel_dp- > >psr.sel_update_enabled); > } > } > > @@ -636,7 +636,7 @@ static void intel_psr_enable_sink(struct intel_dp > *intel_dp) > if (intel_dp->psr.panel_replay_enabled) > return; > > - if (intel_dp->psr.psr2_enabled) { > + if (intel_dp->psr.sel_update_enabled) { > /* Enable ALPM at sink for psr2 */ > drm_dp_dpcd_writeb(&intel_dp->aux, > DP_RECEIVER_ALPM_CONFIG, > DP_ALPM_ENABLE | > @@ -1446,10 +1446,10 @@ void intel_psr_get_config(struct intel_encoder > *encoder, > pipe_config->has_psr = true; > } > > - pipe_config->has_sel_update = intel_dp->psr.psr2_enabled; > + pipe_config->has_sel_update = intel_dp->psr.sel_update_enabled; > pipe_config->infoframes.enable |= > intel_hdmi_infoframe_enable(DP_SDP_VSC); > > - if (!intel_dp->psr.psr2_enabled) > + if (!intel_dp->psr.sel_update_enabled) > goto unlock; > > if (HAS_PSR2_SEL_FETCH(dev_priv)) { > @@ -1485,7 +1485,7 @@ static void intel_psr_activate(struct intel_dp > *intel_dp) > /* psr1, psr2 and panel-replay are mutually exclusive.*/ > if (intel_dp->psr.panel_replay_enabled) > dg2_activate_panel_replay(intel_dp); > - else if (intel_dp->psr.psr2_enabled) > + else if (intel_dp->psr.sel_update_enabled) > hsw_activate_psr2(intel_dp); > else > hsw_activate_psr1(intel_dp); > @@ -1598,7 +1598,7 @@ static void intel_psr_enable_source(struct intel_dp > *intel_dp, > */ > wm_optimization_wa(intel_dp, crtc_state); > > - if (intel_dp->psr.psr2_enabled) { > + if (intel_dp->psr.sel_update_enabled) { > if (DISPLAY_VER(dev_priv) == 9) > intel_de_rmw(dev_priv, > CHICKEN_TRANS(cpu_transcoder), 0, > PSR2_VSC_ENABLE_PROG_HEADER | > @@ -1661,7 +1661,7 @@ static void intel_psr_enable_locked(struct intel_dp > *intel_dp, > > drm_WARN_ON(&dev_priv->drm, intel_dp->psr.enabled); > > - intel_dp->psr.psr2_enabled = crtc_state->has_sel_update; > + intel_dp->psr.sel_update_enabled = crtc_state->has_sel_update; > intel_dp->psr.panel_replay_enabled = crtc_state->has_panel_replay; > intel_dp->psr.busy_frontbuffer_bits = 0; > intel_dp->psr.pipe = to_intel_crtc(crtc_state->uapi.crtc)->pipe; > @@ -1682,7 +1682,7 @@ static void intel_psr_enable_locked(struct intel_dp > *intel_dp, > drm_dbg_kms(&dev_priv->drm, "Enabling Panel Replay\n"); > else > drm_dbg_kms(&dev_priv->drm, "Enabling PSR%s\n", > - intel_dp->psr.psr2_enabled ? "2" : "1"); > + intel_dp->psr.sel_update_enabled ? "2" : "1"); > > intel_snps_phy_update_psr_power_state(dev_priv, phy, true); > intel_psr_enable_sink(intel_dp); > @@ -1714,7 +1714,7 @@ static void intel_psr_exit(struct intel_dp *intel_dp) > if (intel_dp->psr.panel_replay_enabled) { > intel_de_rmw(dev_priv, TRANS_DP2_CTL(intel_dp- > >psr.transcoder), > TRANS_DP2_PANEL_REPLAY_ENABLE, 0); > - } else if (intel_dp->psr.psr2_enabled) { > + } else if (intel_dp->psr.sel_update_enabled) { > tgl_disallow_dc3co_on_psr2_exit(intel_dp); > > val = intel_de_rmw(dev_priv, > EDP_PSR2_CTL(cpu_transcoder), @@ -1737,7 +1737,7 @@ static void > intel_psr_wait_exit_locked(struct intel_dp *intel_dp) > i915_reg_t psr_status; > u32 psr_status_mask; > > - if (intel_dp->psr.psr2_enabled) { > + if (intel_dp->psr.sel_update_enabled) { > psr_status = EDP_PSR2_STATUS(cpu_transcoder); > psr_status_mask = EDP_PSR2_STATUS_STATE_MASK; > } else { > @@ -1767,7 +1767,7 @@ static void intel_psr_disable_locked(struct intel_dp > *intel_dp) > drm_dbg_kms(&dev_priv->drm, "Disabling Panel Replay\n"); > else > drm_dbg_kms(&dev_priv->drm, "Disabling PSR%s\n", > - intel_dp->psr.psr2_enabled ? "2" : "1"); > + intel_dp->psr.sel_update_enabled ? "2" : "1"); > > intel_psr_exit(intel_dp); > intel_psr_wait_exit_locked(intel_dp); > @@ -1780,7 +1780,7 @@ static void intel_psr_disable_locked(struct intel_dp > *intel_dp) > intel_de_rmw(dev_priv, GEN8_CHICKEN_DCPR_1, > wa_16013835468_bit_get(intel_dp), 0); > > - if (intel_dp->psr.psr2_enabled) { > + if (intel_dp->psr.sel_update_enabled) { > /* Wa_16012604467:adlp,mtl[a0,b0] */ > if (IS_DISPLAY_IP_STEP(dev_priv, IP_VER(14, 0), STEP_A0, > STEP_B0)) > intel_de_rmw(dev_priv, > @@ -1796,12 +1796,12 @@ static void intel_psr_disable_locked(struct > intel_dp *intel_dp) > /* Disable PSR on Sink */ > drm_dp_dpcd_writeb(&intel_dp->aux, DP_PSR_EN_CFG, 0); > > - if (intel_dp->psr.psr2_enabled) > + if (intel_dp->psr.sel_update_enabled) > drm_dp_dpcd_writeb(&intel_dp->aux, > DP_RECEIVER_ALPM_CONFIG, 0); > > intel_dp->psr.enabled = false; > intel_dp->psr.panel_replay_enabled = false; > - intel_dp->psr.psr2_enabled = false; > + intel_dp->psr.sel_update_enabled = false; > intel_dp->psr.psr2_sel_fetch_enabled = false; > intel_dp->psr.psr2_sel_fetch_cff_enabled = false; } @@ -2328,7 > +2328,7 @@ void intel_psr_pre_plane_update(struct intel_atomic_state > *state, > needs_to_disable |= > intel_crtc_needs_modeset(new_crtc_state); > needs_to_disable |= !new_crtc_state->has_psr; > needs_to_disable |= !new_crtc_state->active_planes; > - needs_to_disable |= new_crtc_state->has_sel_update != psr- > >psr2_enabled; > + needs_to_disable |= new_crtc_state->has_sel_update != > +psr->sel_update_enabled; > needs_to_disable |= DISPLAY_VER(i915) < 11 && > new_crtc_state->wm_level_disabled; > > @@ -2446,7 +2446,7 @@ void intel_psr_wait_for_idle_locked(const struct > intel_crtc_state *new_crtc_stat > if (!intel_dp->psr.enabled) > continue; > > - if (intel_dp->psr.psr2_enabled) > + if (intel_dp->psr.sel_update_enabled) > ret = > _psr2_ready_for_pipe_update_locked(intel_dp); > else > ret = > _psr1_ready_for_pipe_update_locked(intel_dp); > @@ -2467,7 +2467,7 @@ static bool __psr_wait_for_idle_locked(struct > intel_dp *intel_dp) > if (!intel_dp->psr.enabled) > return false; > > - if (intel_dp->psr.psr2_enabled) { > + if (intel_dp->psr.sel_update_enabled) { > reg = EDP_PSR2_STATUS(cpu_transcoder); > mask = EDP_PSR2_STATUS_STATE_MASK; > } else { > @@ -2708,7 +2708,7 @@ tgl_dc3co_flush_locked(struct intel_dp *intel_dp, > unsigned int frontbuffer_bits, { > struct drm_i915_private *i915 = dp_to_i915(intel_dp); > > - if (!intel_dp->psr.dc3co_exitline || !intel_dp->psr.psr2_enabled || > + if (!intel_dp->psr.dc3co_exitline || !intel_dp- > >psr.sel_update_enabled > +|| > !intel_dp->psr.active) > return; > > @@ -2912,7 +2912,7 @@ static void psr_alpm_check(struct intel_dp > *intel_dp) > u8 val; > int r; > > - if (!psr->psr2_enabled) > + if (!psr->sel_update_enabled) > return; > > r = drm_dp_dpcd_readb(aux, DP_RECEIVER_ALPM_STATUS, &val); > @@ -3084,7 +3084,7 @@ psr_source_status(struct intel_dp *intel_dp, struct > seq_file *m) > const char *status = "unknown"; > u32 val, status_val; > > - if (intel_dp->psr.psr2_enabled) { > + if (intel_dp->psr.sel_update_enabled) { > static const char * const live_status[] = { > "IDLE", > "CAPTURE", > @@ -3148,7 +3148,7 @@ static int intel_psr_status(struct seq_file *m, struct > intel_dp *intel_dp) > if (psr->panel_replay_enabled) > status = "Panel Replay Enabled"; > else if (psr->enabled) > - status = psr->psr2_enabled ? "PSR2 enabled" : "PSR1 > enabled"; > + status = psr->sel_update_enabled ? "PSR2 enabled" : "PSR1 > enabled"; > else > status = "disabled"; > seq_printf(m, "PSR mode: %s\n", status); @@ -3163,7 +3163,7 @@ > static int intel_psr_status(struct seq_file *m, struct intel_dp *intel_dp) > if (psr->panel_replay_enabled) { > val = intel_de_read(dev_priv, > TRANS_DP2_CTL(cpu_transcoder)); > enabled = val & TRANS_DP2_PANEL_REPLAY_ENABLE; > - } else if (psr->psr2_enabled) { > + } else if (psr->sel_update_enabled) { > val = intel_de_read(dev_priv, > EDP_PSR2_CTL(cpu_transcoder)); > enabled = val & EDP_PSR2_ENABLE; > } else { > @@ -3189,7 +3189,7 @@ static int intel_psr_status(struct seq_file *m, struct > intel_dp *intel_dp) > seq_printf(m, "Last exit at: %lld\n", psr->last_exit); > } > > - if (psr->psr2_enabled) { > + if (psr->sel_update_enabled) { > u32 su_frames_val[3]; > int frame; > > -- > 2.34.1