On Mon, Sep 18, 2023 at 09:25:04PM +0300, Imre Deak wrote:
> Rename intel_modeset_all_pipes() to intel_modeset_all_pipes_late() to
> clarify when the function can be called (vs.
> intel_modeset_pipes_in_mask_early()).
>
> Cc: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> Signed-off-by: Imre Deak <imre.deak@xxxxxxxxx>
Reviewed-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_cdclk.c | 2 +-
> drivers/gpu/drm/i915/display/intel_display.c | 6 +++---
> drivers/gpu/drm/i915/display/intel_display.h | 4 ++--
> drivers/gpu/drm/i915/display/skl_watermark.c | 2 +-
> 4 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c b/drivers/gpu/drm/i915/display/intel_cdclk.c
> index ad5251ba6fe13..a2e20b25d6361 100644
> --- a/drivers/gpu/drm/i915/display/intel_cdclk.c
> +++ b/drivers/gpu/drm/i915/display/intel_cdclk.c
> @@ -3139,7 +3139,7 @@ int intel_modeset_calc_cdclk(struct intel_atomic_state *state)
> } else if (intel_cdclk_needs_modeset(&old_cdclk_state->actual,
> &new_cdclk_state->actual)) {
> /* All pipes must be switched off while we change the cdclk. */
> - ret = intel_modeset_all_pipes(state, "CDCLK change");
> + ret = intel_modeset_all_pipes_late(state, "CDCLK change");
> if (ret)
> return ret;
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index 1c9a128f4af27..9a69b8848fee6 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -5475,7 +5475,7 @@ int intel_modeset_pipes_in_mask_early(struct intel_atomic_state *state,
> }
>
> /**
> - * intel_modeset_all_pipes - force a full modeset on all pipes
> + * intel_modeset_all_pipes_late - force a full modeset on all pipes
> * @state: intel atomic state
> * @reason: the reason for the full modeset
> *
> @@ -5485,8 +5485,8 @@ int intel_modeset_pipes_in_mask_early(struct intel_atomic_state *state,
> *
> * Returns 0 in case of success, negative error code otherwise.
> */
> -int intel_modeset_all_pipes(struct intel_atomic_state *state,
> - const char *reason)
> +int intel_modeset_all_pipes_late(struct intel_atomic_state *state,
> + const char *reason)
> {
> struct drm_i915_private *dev_priv = to_i915(state->base.dev);
> struct intel_crtc *crtc;
> diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
> index 3008e8b2b437e..64a5be7859331 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.h
> +++ b/drivers/gpu/drm/i915/display/intel_display.h
> @@ -515,8 +515,8 @@ void intel_update_watermarks(struct drm_i915_private *i915);
> /* modesetting */
> int intel_modeset_pipes_in_mask_early(struct intel_atomic_state *state,
> const char *reason, u8 pipe_mask);
> -int intel_modeset_all_pipes(struct intel_atomic_state *state,
> - const char *reason);
> +int intel_modeset_all_pipes_late(struct intel_atomic_state *state,
> + const char *reason);
> void intel_modeset_get_crtc_power_domains(struct intel_crtc_state *crtc_state,
> struct intel_power_domain_mask *old_domains);
> void intel_modeset_put_crtc_power_domains(struct intel_crtc *crtc,
> diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c b/drivers/gpu/drm/i915/display/skl_watermark.c
> index 063929a42a42f..a29d9b717deed 100644
> --- a/drivers/gpu/drm/i915/display/skl_watermark.c
> +++ b/drivers/gpu/drm/i915/display/skl_watermark.c
> @@ -2616,7 +2616,7 @@ skl_compute_ddb(struct intel_atomic_state *state)
>
> if (old_dbuf_state->joined_mbus != new_dbuf_state->joined_mbus) {
> /* TODO: Implement vblank synchronized MBUS joining changes */
> - ret = intel_modeset_all_pipes(state, "MBUS joining change");
> + ret = intel_modeset_all_pipes_late(state, "MBUS joining change");
> if (ret)
> return ret;
> }
> --
> 2.37.2
--
Ville Syrjälä
Intel
