Commit a6d3460e authored by Matt Roper's avatar Matt Roper

drm/i915/gen9: Drop re-allocation of DDB at atomic commit (v2)

Now that we're properly pre-allocating the DDB during the atomic check
phase and we trust that the allocation is appropriate, let's actually
use the allocation computed and not duplicate that work during the
commit phase.

v2:
 - Significant rebasing now that we can use cached data rates and
   minimum block allocations to avoid grabbing additional plane states.
Signed-off-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1463061971-19638-11-git-send-email-matthew.d.roper@intel.com
parent 98d39494
...@@ -13600,6 +13600,7 @@ static int intel_atomic_commit(struct drm_device *dev, ...@@ -13600,6 +13600,7 @@ static int intel_atomic_commit(struct drm_device *dev,
drm_atomic_helper_swap_state(dev, state); drm_atomic_helper_swap_state(dev, state);
dev_priv->wm.config = intel_state->wm_config; dev_priv->wm.config = intel_state->wm_config;
dev_priv->wm.distrust_bios_wm = false; dev_priv->wm.distrust_bios_wm = false;
dev_priv->wm.skl_results.ddb = intel_state->ddb;
intel_shared_dpll_commit(state); intel_shared_dpll_commit(state);
if (intel_state->modeset) { if (intel_state->modeset) {
...@@ -13717,19 +13718,6 @@ static int intel_atomic_commit(struct drm_device *dev, ...@@ -13717,19 +13718,6 @@ static int intel_atomic_commit(struct drm_device *dev,
intel_modeset_verify_crtc(crtc, old_crtc_state, crtc->state); intel_modeset_verify_crtc(crtc, old_crtc_state, crtc->state);
} }
/*
* Temporary sanity check: make sure our pre-computed DDB matches the
* one we actually wind up programming.
*
* Not a great place to put this, but the easiest place we have access
* to both the pre-computed and final DDB's; we'll be removing this
* check in the next patch anyway.
*/
WARN(IS_GEN9(dev) &&
memcmp(&intel_state->ddb, &dev_priv->wm.skl_results.ddb,
sizeof(intel_state->ddb)),
"Pre-computed DDB does not match final DDB!\n");
if (intel_state->modeset) if (intel_state->modeset)
intel_display_power_put(dev_priv, POWER_DOMAIN_MODESET); intel_display_power_put(dev_priv, POWER_DOMAIN_MODESET);
......
This diff is collapsed.
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