[PATCH 8/8] Revert "drm/i915: Decouple cdclk calculation from modeset checks"

[Chris Wilson]

This reverts commit c93b9b2c79296e7ea0fe31f1eafda20bb288dafd.
---
 drivers/gpu/drm/i915/display/intel_display.c | 22 +++++++++-----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 5c159228cbe6..321438ea7077 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -14566,6 +14566,12 @@ static int intel_modeset_checks(struct intel_atomic_state *state)
 			return ret;
 	}
 
+	ret = intel_modeset_calc_cdclk(state);
+	if (ret)
+		return ret;
+
+	intel_modeset_clear_plls(state);
+
 	if (IS_HASWELL(dev_priv))
 		return hsw_mode_set_planes_workaround(state);
 
@@ -14897,24 +14903,16 @@ static int intel_atomic_check(struct drm_device *dev,
 			goto fail;
 	}
 
-	intel_fbc_choose_crtc(dev_priv, state);
-	ret = calc_watermark_data(state);
+	ret = intel_atomic_check_crtcs(state);
 	if (ret)
 		goto fail;
 
-	ret = intel_bw_atomic_check(state);
+	intel_fbc_choose_crtc(dev_priv, state);
+	ret = calc_watermark_data(state);
 	if (ret)
 		goto fail;
 
-	if (any_ms) {
-		ret = intel_modeset_calc_cdclk(state);
-		if (ret)
-			return ret;
-
-		intel_modeset_clear_plls(state);
-	}
-
-	ret = intel_atomic_check_crtcs(state);
+	ret = intel_bw_atomic_check(state);
 	if (ret)
 		goto fail;
 
-- 
2.20.1