diff options
| author | Imre Deak <imre.deak@intel.com> | 2023-09-21 22:51:55 +0300 |
|---|---|---|
| committer | Imre Deak <imre.deak@intel.com> | 2023-09-28 12:52:17 +0300 |
| commit | e3b269049103444ccbaafdaa470571d44322375b (patch) | |
| tree | 280159709a0d9b0be5f5ce155aa7ae9d63c3aa83 /drivers/gpu/drm/i915 | |
| parent | fa7a7a1c9c0517add2efb7040d6bfb197f747915 (diff) | |
| download | linux-e3b269049103444ccbaafdaa470571d44322375b.tar.xz | |
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: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230921195159.2646027-8-imre.deak@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915')
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_cdclk.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_display.c | 6 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_display.h | 4 | ||||
| -rw-r--r-- | 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 b55a3f75f392..6d7ba4d0f130 100644 --- a/drivers/gpu/drm/i915/display/intel_cdclk.c +++ b/drivers/gpu/drm/i915/display/intel_cdclk.c @@ -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; diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 9d60bac1aed5..e04374319e81 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -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,8 +5536,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 37b2c290fc16..0e5dffe8f018 100644 --- a/drivers/gpu/drm/i915/display/intel_display.h +++ b/drivers/gpu/drm/i915/display/intel_display.h @@ -513,8 +513,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 c1a90e058ffd..846e9a3e94dc 100644 --- a/drivers/gpu/drm/i915/display/skl_watermark.c +++ b/drivers/gpu/drm/i915/display/skl_watermark.c @@ -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; } |