From: Ville Syrjälä <[email protected]> Add a new intel_atomic_check_crtcs() that gets called fairly early during intel_atomic_check() and start collecting stuff into it from elsewhere. For now we can suck in the intel_crtc_min_cdclk() stiff.
Reviewed-by: Luca Coelho <[email protected]> Signed-off-by: Ville Syrjälä <[email protected]> --- drivers/gpu/drm/i915/display/intel_display.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 7f00ed9d3d10..100535f5409f 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -5754,6 +5754,18 @@ static void intel_crtc_check_fastset(const struct intel_crtc_state *old_crtc_sta new_crtc_state->update_pipe = true; } +static int intel_atomic_check_crtcs(struct intel_atomic_state *state) +{ + struct intel_crtc_state *new_crtc_state; + struct intel_crtc *crtc; + int i; + + for_each_new_intel_crtc_in_state(state, crtc, new_crtc_state, i) + new_crtc_state->min_cdclk = intel_crtc_min_cdclk(new_crtc_state); + + return 0; +} + static int intel_atomic_check_crtcs_late(struct intel_atomic_state *state) { struct intel_display *display = to_intel_display(state); @@ -6457,8 +6469,9 @@ int intel_atomic_check(struct drm_device *dev, if (ret) goto fail; - for_each_new_intel_crtc_in_state(state, crtc, new_crtc_state, i) - new_crtc_state->min_cdclk = intel_crtc_min_cdclk(new_crtc_state); + ret = intel_atomic_check_crtcs(state); + if (ret) + goto fail; ret = intel_compute_global_watermarks(state); if (ret) -- 2.49.1
