On Fri, 2025-10-17 at 19:14 +0300, Ville Syrjala wrote: > From: Ville Syrjälä <[email protected]> > > Move the skl_update_scaler_crtc() call into intel_crtc_compute_config(). > It no longer has any dependency on CDLCK/etc. so it doesn't need to be > done so late. > > The fastset/modeset checks are redundant now as that's exactly > when intel_crtc_compute_config() is called. > > Signed-off-by: Ville Syrjälä <[email protected]> > ---
Reviewed-by: Luca Coelho <[email protected]> -- Cheers, Luca. > drivers/gpu/drm/i915/display/intel_display.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c > b/drivers/gpu/drm/i915/display/intel_display.c > index 211761c5b72a..0c483a4994c2 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -2406,6 +2406,7 @@ static int > intel_crtc_compute_set_context_latency(struct intel_atomic_state *sta > static int intel_crtc_compute_config(struct intel_atomic_state *state, > struct intel_crtc *crtc) > { > + struct intel_display *display = to_intel_display(state); > struct intel_crtc_state *crtc_state = > intel_atomic_get_new_crtc_state(state, crtc); > int ret; > @@ -2433,6 +2434,12 @@ static int intel_crtc_compute_config(struct > intel_atomic_state *state, > > intel_vrr_compute_guardband(crtc_state); > > + if (DISPLAY_VER(display) >= 9) { > + ret = skl_update_scaler_crtc(crtc_state); > + if (ret) > + return ret; > + } > + > return 0; > } > > @@ -4223,13 +4230,6 @@ static int intel_crtc_atomic_check_late(struct > intel_atomic_state *state, > } > > if (DISPLAY_VER(display) >= 9) { > - if (intel_crtc_needs_modeset(crtc_state) || > - intel_crtc_needs_fastset(crtc_state)) { > - ret = skl_update_scaler_crtc(crtc_state); > - if (ret) > - return ret; > - } > - > ret = intel_atomic_setup_scalers(state, crtc); > if (ret) > return ret;
