On Tue, 03 May 2022, Ville Syrjala <ville.syrjala@xxxxxxxxxxxxxxx> wrote:
> From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>
> Now that we no longer do the fuzzy clock and M/N checks we can
> get rid of the fastset state copy hacks.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
Reviewed-by: Jani Nikula <jani.nikula@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_display.c | 28 +++-----------------
> 1 file changed, 3 insertions(+), 25 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index 066b9e7a5696..11e974d66c29 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -7013,23 +7013,6 @@ static void intel_crtc_check_fastset(const struct intel_crtc_state *old_crtc_sta
> new_crtc_state->update_pipe = true;
> }
>
> -static void intel_crtc_copy_fastset(const struct intel_crtc_state *old_crtc_state,
> - struct intel_crtc_state *new_crtc_state)
> -{
> - /*
> - * If we're not doing the full modeset we want to
> - * keep the current M/N values as they may be
> - * sufficiently different to the computed values
> - * to cause problems.
> - *
> - * FIXME: should really copy more fuzzy state here
> - */
> - new_crtc_state->fdi_m_n = old_crtc_state->fdi_m_n;
> - new_crtc_state->dp_m_n = old_crtc_state->dp_m_n;
> - new_crtc_state->dp_m2_n2 = old_crtc_state->dp_m2_n2;
> - new_crtc_state->has_drrs = old_crtc_state->has_drrs;
> -}
> -
> static int intel_crtc_add_planes_to_state(struct intel_atomic_state *state,
> struct intel_crtc *crtc,
> u8 plane_ids_mask)
> @@ -7739,17 +7722,12 @@ static int intel_atomic_check(struct drm_device *dev,
>
> for_each_oldnew_intel_crtc_in_state(state, crtc, old_crtc_state,
> new_crtc_state, i) {
> - if (intel_crtc_needs_modeset(new_crtc_state)) {
> - any_ms = true;
> -
> - intel_release_shared_dplls(state, crtc);
> + if (!intel_crtc_needs_modeset(new_crtc_state))
> continue;
> - }
>
> - if (!new_crtc_state->update_pipe)
> - continue;
> + any_ms = true;
>
> - intel_crtc_copy_fastset(old_crtc_state, new_crtc_state);
> + intel_release_shared_dplls(state, crtc);
> }
>
> if (any_ms && !check_digital_port_conflicts(state)) {
--
Jani Nikula, Intel Open Source Graphics Center
