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: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 658fe24961ebfaa5ddac81043fd95c3cd26fa412..5a0d34c47885d5d4404f37d4ceea8b22c93a7d7a 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -467,6 +467,7 @@ static int i915_drm_freeze(struct drm_device *dev)
        i915_save_state(dev);
 
        intel_opregion_fini(dev);
+       intel_uncore_fini(dev);
 
        console_lock();
        intel_fbdev_set_suspend(dev, FBINFO_STATE_SUSPENDED);

diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
index 7861d97600e1819ecbd75aaf6f278e7fe8424d49..361d1eae3cfd0b3fce40cf87dc68a58adc99f720 100644 (file)
--- a/drivers/gpu/drm/i915/intel_uncore.c
+++ b/drivers/gpu/drm/i915/intel_uncore.c
@@ -805,6 +805,10 @@ void intel_uncore_fini(struct drm_device *dev)
        /* Paranoia: make sure we have disabled everything before we exit. */
        intel_uncore_sanitize(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 {