drm/i915: Decouple cdclk calculation from modeset checks

We need to calculate cdclk after watermarks/ddb has been calculated
as with recent hw CDCLK needs to be adjusted accordingly to DBuf
requirements, which is not possible with current code organization.

Setting CDCLK according to DBuf BW requirements and not just rejecting
if it doesn't satisfy BW requirements, will allow us to save power when
it is possible and gain additional bandwidth when it's needed - i.e
boosting both our power management and perfomance capabilities.

This patch is preparation for that, first we now extract modeset
calculation from modeset checks, in order to call it after wm/ddb
has been calculated.

v2: - Extract only intel_modeset_calc_cdclk from intel_modeset_checks
      (Ville Syrjälä)

v3: - Clear plls after intel_modeset_calc_cdclk

v4: - Added r-b from previous revision to commit message

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
Signed-off-by: Manasi Navare <manasi.d.navare@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200519131117.17190-2-stanislav.lisovskiy@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index f22d11f..58e2c06 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -14567,12 +14567,6 @@ 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);
 
@@ -14904,10 +14898,6 @@ static int intel_atomic_check(struct drm_device *dev,
                        goto fail;
        }
 
-       ret = intel_atomic_check_crtcs(state);
-       if (ret)
-               goto fail;
-
        intel_fbc_choose_crtc(dev_priv, state);
        ret = calc_watermark_data(state);
        if (ret)
@@ -14917,6 +14907,18 @@ static int intel_atomic_check(struct drm_device *dev,
        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);
+       if (ret)
+               goto fail;
+
        for_each_oldnew_intel_crtc_in_state(state, crtc, old_crtc_state,
                                            new_crtc_state, i) {
                if (!needs_modeset(new_crtc_state) &&