Commit e3b26904 authored by Imre Deak's avatar Imre Deak
Browse files

drm/i915: Rename intel_modeset_all_pipes() to intel_modeset_all_pipes_late() 



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@linux.intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230921195159.2646027-8-imre.deak@intel.com
parent fa7a7a1c

drivers/gpu/drm/i915/display/intel_cdclk.c

+1 −1
Original line number Diff line number Diff line
@@ -3170,7 +3170,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;

drivers/gpu/drm/i915/display/intel_display.c

+3 −3
Original line number Diff line number Diff line
@@ -5526,7 +5526,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

 *
@@ -5536,7 +5536,7 @@ 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,

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);

drivers/gpu/drm/i915/display/intel_display.h

+2 −2
Original line number Diff line number Diff line
@@ -513,7 +513,7 @@ 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,

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);

drivers/gpu/drm/i915/display/skl_watermark.c

+1 −1
Original line number Diff line number Diff line
@@ -2618,7 +2618,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;

		}