On Fri, Mar 01, 2024 at 04:35:59PM +0200, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>
> Stop passing in so much redundant stuff to
> intel_old_crtc_state_disables(). Top level atomic state + crtc
> is all we need.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
Reviewed-by: Stanislav Lisovskiy <stanislav.lisovskiy@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_display.c | 18 +++++++-----------
> 1 file changed, 7 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index 01d7e91cb1bc..1df3923cc30d 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -6753,11 +6753,11 @@ static void intel_update_crtc(struct intel_atomic_state *state,
> }
>
> static void intel_old_crtc_state_disables(struct intel_atomic_state *state,
> - struct intel_crtc_state *old_crtc_state,
> - struct intel_crtc_state *new_crtc_state,
> struct intel_crtc *crtc)
> {
> struct drm_i915_private *dev_priv = to_i915(state->base.dev);
> + const struct intel_crtc_state *new_crtc_state =
> + intel_atomic_get_new_crtc_state(state, crtc);
>
> /*
> * We need to disable pipe CRC before disabling the pipe,
> @@ -6776,7 +6776,7 @@ static void intel_old_crtc_state_disables(struct intel_atomic_state *state,
> static void intel_commit_modeset_disables(struct intel_atomic_state *state)
> {
> struct drm_i915_private *i915 = to_i915(state->base.dev);
> - struct intel_crtc_state *new_crtc_state, *old_crtc_state;
> + const struct intel_crtc_state *new_crtc_state, *old_crtc_state;
> struct intel_crtc *crtc;
> u8 disable_pipes = 0;
> int i;
> @@ -6806,8 +6806,7 @@ static void intel_commit_modeset_disables(struct intel_atomic_state *state)
> }
>
> /* Only disable port sync and MST slaves */
> - for_each_oldnew_intel_crtc_in_state(state, crtc, old_crtc_state,
> - new_crtc_state, i) {
> + for_each_old_intel_crtc_in_state(state, crtc, old_crtc_state, i) {
> if ((disable_pipes & BIT(crtc->pipe)) == 0)
> continue;
>
> @@ -6821,20 +6820,17 @@ static void intel_commit_modeset_disables(struct intel_atomic_state *state)
> !intel_crtc_is_bigjoiner_slave(old_crtc_state))
> continue;
>
> - intel_old_crtc_state_disables(state, old_crtc_state,
> - new_crtc_state, crtc);
> + intel_old_crtc_state_disables(state, crtc);
>
> disable_pipes &= ~BIT(crtc->pipe);
> }
>
> /* Disable everything else left on */
> - for_each_oldnew_intel_crtc_in_state(state, crtc, old_crtc_state,
> - new_crtc_state, i) {
> + for_each_old_intel_crtc_in_state(state, crtc, old_crtc_state, i) {
> if ((disable_pipes & BIT(crtc->pipe)) == 0)
> continue;
>
> - intel_old_crtc_state_disables(state, old_crtc_state,
> - new_crtc_state, crtc);
> + intel_old_crtc_state_disables(state, crtc);
>
> disable_pipes &= ~BIT(crtc->pipe);
> }
> --
> 2.43.0
>
