Skip to content

Commit e3b2690

Browse files
committed
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ä <[email protected]> Reviewed-by: Ville Syrjälä <[email protected]> Signed-off-by: Imre Deak <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent fa7a7a1 commit e3b2690

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3170,7 +3170,7 @@ int intel_modeset_calc_cdclk(struct intel_atomic_state *state)
31703170
} else if (intel_cdclk_needs_modeset(&old_cdclk_state->actual,
31713171
&new_cdclk_state->actual)) {
31723172
/* All pipes must be switched off while we change the cdclk. */
3173-
ret = intel_modeset_all_pipes(state, "CDCLK change");
3173+
ret = intel_modeset_all_pipes_late(state, "CDCLK change");
31743174
if (ret)
31753175
return ret;
31763176

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5526,7 +5526,7 @@ int intel_modeset_pipes_in_mask_early(struct intel_atomic_state *state,
55265526
}
55275527

55285528
/**
5529-
* intel_modeset_all_pipes - force a full modeset on all pipes
5529+
* intel_modeset_all_pipes_late - force a full modeset on all pipes
55305530
* @state: intel atomic state
55315531
* @reason: the reason for the full modeset
55325532
*
@@ -5536,8 +5536,8 @@ int intel_modeset_pipes_in_mask_early(struct intel_atomic_state *state,
55365536
*
55375537
* Returns 0 in case of success, negative error code otherwise.
55385538
*/
5539-
int intel_modeset_all_pipes(struct intel_atomic_state *state,
5540-
const char *reason)
5539+
int intel_modeset_all_pipes_late(struct intel_atomic_state *state,
5540+
const char *reason)
55415541
{
55425542
struct drm_i915_private *dev_priv = to_i915(state->base.dev);
55435543
struct intel_crtc *crtc;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -513,8 +513,8 @@ void intel_update_watermarks(struct drm_i915_private *i915);
513513
/* modesetting */
514514
int intel_modeset_pipes_in_mask_early(struct intel_atomic_state *state,
515515
const char *reason, u8 pipe_mask);
516-
int intel_modeset_all_pipes(struct intel_atomic_state *state,
517-
const char *reason);
516+
int intel_modeset_all_pipes_late(struct intel_atomic_state *state,
517+
const char *reason);
518518
void intel_modeset_get_crtc_power_domains(struct intel_crtc_state *crtc_state,
519519
struct intel_power_domain_mask *old_domains);
520520
void intel_modeset_put_crtc_power_domains(struct intel_crtc *crtc,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2618,7 +2618,7 @@ skl_compute_ddb(struct intel_atomic_state *state)
26182618

26192619
if (old_dbuf_state->joined_mbus != new_dbuf_state->joined_mbus) {
26202620
/* TODO: Implement vblank synchronized MBUS joining changes */
2621-
ret = intel_modeset_all_pipes(state, "MBUS joining change");
2621+
ret = intel_modeset_all_pipes_late(state, "MBUS joining change");
26222622
if (ret)
26232623
return ret;
26242624
}

0 commit comments

Comments
 (0)