On Tue, 2025-02-18 at 23:19 +0200, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>
> Hoist the bw stuff into a separate function from
> intel_crtc_disable_noatomic_complete() so that the details
> are better hidden inside intel_bw.c.
>
> We can also skip the whole thing on pre-skl since the dbuf state
> isn't actually used on those platforms.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_bw.c | 14 ++++++++++++++
> drivers/gpu/drm/i915/display/intel_bw.h | 2 ++
> drivers/gpu/drm/i915/display/intel_modeset_setup.c | 6 +-----
> 3 files changed, 17 insertions(+), 5 deletions(-)
>
Reviewed-by: Vinod Govindapillai <vinod.govindapillai@xxxxxxxxx>
> diff --git a/drivers/gpu/drm/i915/display/intel_bw.c b/drivers/gpu/drm/i915/display/intel_bw.c
> index 23edc81741de..417d2d527ae4 100644
> --- a/drivers/gpu/drm/i915/display/intel_bw.c
> +++ b/drivers/gpu/drm/i915/display/intel_bw.c
> @@ -1422,6 +1422,20 @@ int intel_bw_atomic_check(struct intel_atomic_state *state)
> return 0;
> }
>
> +void intel_bw_crtc_disable_noatomic(struct intel_crtc *crtc)
> +{
> + struct intel_display *display = to_intel_display(crtc);
> + struct intel_bw_state *bw_state =
> + to_intel_bw_state(display->bw.obj.state);
> + enum pipe pipe = crtc->pipe;
> +
> + if (DISPLAY_VER(display) < 9)
> + return;
> +
> + bw_state->data_rate[pipe] = 0;
> + bw_state->num_active_planes[pipe] = 0;
> +}
> +
> static struct intel_global_state *
> intel_bw_duplicate_state(struct intel_global_obj *obj)
> {
> diff --git a/drivers/gpu/drm/i915/display/intel_bw.h b/drivers/gpu/drm/i915/display/intel_bw.h
> index 161813cca473..bd94dde207ee 100644
> --- a/drivers/gpu/drm/i915/display/intel_bw.h
> +++ b/drivers/gpu/drm/i915/display/intel_bw.h
> @@ -14,6 +14,7 @@
>
> struct drm_i915_private;
> struct intel_atomic_state;
> +struct intel_crtc;
> struct intel_crtc_state;
>
> struct intel_dbuf_bw {
> @@ -81,5 +82,6 @@ int intel_bw_calc_min_cdclk(struct intel_atomic_state *state,
> bool *need_cdclk_calc);
> int intel_bw_min_cdclk(struct drm_i915_private *i915,
> const struct intel_bw_state *bw_state);
> +void intel_bw_crtc_disable_noatomic(struct intel_crtc *crtc);
>
> #endif /* __INTEL_BW_H__ */
> diff --git a/drivers/gpu/drm/i915/display/intel_modeset_setup.c
> b/drivers/gpu/drm/i915/display/intel_modeset_setup.c
> index 10a2421f7c50..e9b0533526f6 100644
> --- a/drivers/gpu/drm/i915/display/intel_modeset_setup.c
> +++ b/drivers/gpu/drm/i915/display/intel_modeset_setup.c
> @@ -156,8 +156,6 @@ static void intel_crtc_disable_noatomic_complete(struct intel_crtc *crtc)
> {
> struct intel_display *display = to_intel_display(crtc);
> struct drm_i915_private *i915 = to_i915(crtc->base.dev);
> - struct intel_bw_state *bw_state =
> - to_intel_bw_state(i915->display.bw.obj.state);
> struct intel_pmdemand_state *pmdemand_state =
> to_intel_pmdemand_state(i915->display.pmdemand.obj.state);
> struct intel_crtc_state *crtc_state =
> @@ -177,9 +175,7 @@ static void intel_crtc_disable_noatomic_complete(struct intel_crtc *crtc)
>
> intel_cdclk_crtc_disable_noatomic(crtc);
> skl_wm_crtc_disable_noatomic(crtc);
> -
> - bw_state->data_rate[pipe] = 0;
> - bw_state->num_active_planes[pipe] = 0;
> + intel_bw_crtc_disable_noatomic(crtc);
>
> intel_pmdemand_update_port_clock(display, pmdemand_state, pipe, 0);
> }
