On Tue, 2025-02-18 at 23:19 +0200, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>
> intel_bw_crtc_update() is only used by the readout path, so relocate
> the function next its only caller. Easier to read the code when related
> things are nearby.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_bw.c | 42 ++++++++++++-------------
> 1 file changed, 21 insertions(+), 21 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 2a669b8535e0..fba5fc607c30 100644
> --- a/drivers/gpu/drm/i915/display/intel_bw.c
> +++ b/drivers/gpu/drm/i915/display/intel_bw.c
> @@ -806,27 +806,6 @@ static int intel_bw_crtc_min_cdclk(const struct intel_crtc_state *crtc_state)
> return DIV_ROUND_UP_ULL(mul_u32_u32(intel_bw_crtc_data_rate(crtc_state), 10), 512);
> }
>
> -static void intel_bw_crtc_update(struct intel_bw_state *bw_state,
> - const struct intel_crtc_state *crtc_state)
> -{
> - struct intel_display *display = to_intel_display(crtc_state);
> - struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
> - struct drm_i915_private *i915 = to_i915(crtc->base.dev);
> -
> - if (DISPLAY_VER(display) >= 11) {
> - bw_state->data_rate[crtc->pipe] =
> - intel_bw_crtc_data_rate(crtc_state);
> - bw_state->num_active_planes[crtc->pipe] =
> - intel_bw_crtc_num_active_planes(crtc_state);
> - }
> - bw_state->force_check_qgv = true;
> -
> - drm_dbg_kms(&i915->drm, "pipe %c data rate %u num active planes %u\n",
> - pipe_name(crtc->pipe),
> - bw_state->data_rate[crtc->pipe],
> - bw_state->num_active_planes[crtc->pipe]);
> -}
> -
> static unsigned int intel_bw_num_active_planes(struct drm_i915_private *dev_priv,
> const struct intel_bw_state *bw_state)
> {
> @@ -1425,6 +1404,27 @@ int intel_bw_atomic_check(struct intel_atomic_state *state)
> return 0;
> }
>
> +static void intel_bw_crtc_update(struct intel_bw_state *bw_state,
> + const struct intel_crtc_state *crtc_state)
> +{
> + struct intel_display *display = to_intel_display(crtc_state);
> + struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
> + struct drm_i915_private *i915 = to_i915(crtc->base.dev);
> +
> + if (DISPLAY_VER(display) >= 11) {
> + bw_state->data_rate[crtc->pipe] =
> + intel_bw_crtc_data_rate(crtc_state);
> + bw_state->num_active_planes[crtc->pipe] =
> + intel_bw_crtc_num_active_planes(crtc_state);
> + }
> + bw_state->force_check_qgv = true;
> +
> + drm_dbg_kms(&i915->drm, "pipe %c data rate %u num active planes %u\n",
> + pipe_name(crtc->pipe),
> + bw_state->data_rate[crtc->pipe],
> + bw_state->num_active_planes[crtc->pipe]);
> +}
> +
> void intel_bw_update_hw_state(struct intel_display *display)
> {
> struct intel_bw_state *bw_state =
