Commit 28d85cd3 authored by Chris Wilson's avatar Chris Wilson Committed by Daniel Vetter

drm/i915: Reset forcewake before suspend

Now that we regularly defer the forcewake dance to a timer func, it is
likely to fire after we disable the device during suspend. This
generates an oops as we detect inconsistency in the hardware state. So
before suspend, we want to complete the outstanding dance and generally
sanitize the registers before handing back to the BIOS.
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 3ddffb7b
...@@ -467,6 +467,7 @@ static int i915_drm_freeze(struct drm_device *dev) ...@@ -467,6 +467,7 @@ static int i915_drm_freeze(struct drm_device *dev)
i915_save_state(dev); i915_save_state(dev);
intel_opregion_fini(dev); intel_opregion_fini(dev);
intel_uncore_fini(dev);
console_lock(); console_lock();
intel_fbdev_set_suspend(dev, FBINFO_STATE_SUSPENDED); intel_fbdev_set_suspend(dev, FBINFO_STATE_SUSPENDED);
......
...@@ -805,6 +805,10 @@ void intel_uncore_fini(struct drm_device *dev) ...@@ -805,6 +805,10 @@ void intel_uncore_fini(struct drm_device *dev)
/* Paranoia: make sure we have disabled everything before we exit. */ /* Paranoia: make sure we have disabled everything before we exit. */
intel_uncore_sanitize(dev); intel_uncore_sanitize(dev);
intel_uncore_forcewake_reset(dev); intel_uncore_forcewake_reset(dev);
dev_priv->uncore.forcewake_count = 0;
dev_priv->uncore.fw_rendercount = 0;
dev_priv->uncore.fw_mediacount = 0;
} }
static const struct register_whitelist { static const struct register_whitelist {
......
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