Commit c93b9b2c authored by Stanislav Lisovskiy's avatar Stanislav Lisovskiy Committed by Manasi Navare

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: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarStanislav Lisovskiy <stanislav.lisovskiy@intel.com>
Signed-off-by: default avatarManasi Navare <manasi.d.navare@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200519131117.17190-2-stanislav.lisovskiy@intel.com
parent aedbe0a1
...@@ -14567,12 +14567,6 @@ static int intel_modeset_checks(struct intel_atomic_state *state) ...@@ -14567,12 +14567,6 @@ static int intel_modeset_checks(struct intel_atomic_state *state)
return ret; return ret;
} }
ret = intel_modeset_calc_cdclk(state);
if (ret)
return ret;
intel_modeset_clear_plls(state);
if (IS_HASWELL(dev_priv)) if (IS_HASWELL(dev_priv))
return hsw_mode_set_planes_workaround(state); return hsw_mode_set_planes_workaround(state);
...@@ -14904,10 +14898,6 @@ static int intel_atomic_check(struct drm_device *dev, ...@@ -14904,10 +14898,6 @@ static int intel_atomic_check(struct drm_device *dev,
goto fail; goto fail;
} }
ret = intel_atomic_check_crtcs(state);
if (ret)
goto fail;
intel_fbc_choose_crtc(dev_priv, state); intel_fbc_choose_crtc(dev_priv, state);
ret = calc_watermark_data(state); ret = calc_watermark_data(state);
if (ret) if (ret)
...@@ -14917,6 +14907,18 @@ static int intel_atomic_check(struct drm_device *dev, ...@@ -14917,6 +14907,18 @@ static int intel_atomic_check(struct drm_device *dev,
if (ret) if (ret)
goto fail; 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, for_each_oldnew_intel_crtc_in_state(state, crtc, old_crtc_state,
new_crtc_state, i) { new_crtc_state, i) {
if (!needs_modeset(new_crtc_state) && if (!needs_modeset(new_crtc_state) &&
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment