Commit 1daed3fb authored by Jesse Barnes's avatar Jesse Barnes Committed by Chris Wilson
Browse files

drm/i915: fix rc6 enabling around suspend/resume



Enabling RC6 implies setting a graphics context.  Make sure we do that
only after the ring has been enabled, otherwise our ring commands will
hang.

Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 88271da3
...@@ -357,6 +357,9 @@ static int i915_drm_thaw(struct drm_device *dev) ...@@ -357,6 +357,9 @@ static int i915_drm_thaw(struct drm_device *dev)
drm_helper_resume_force_mode(dev); drm_helper_resume_force_mode(dev);
} }
/* Clock gating state */
intel_enable_clock_gating(dev);
intel_opregion_init(dev); intel_opregion_init(dev);
dev_priv->modeset_on_lid = 0; dev_priv->modeset_on_lid = 0;
......
...@@ -868,9 +868,6 @@ int i915_restore_state(struct drm_device *dev) ...@@ -868,9 +868,6 @@ int i915_restore_state(struct drm_device *dev)
I915_WRITE (IMR, dev_priv->saveIMR); I915_WRITE (IMR, dev_priv->saveIMR);
} }
/* Clock gating state */
intel_enable_clock_gating(dev);
if (IS_IRONLAKE_M(dev)) { if (IS_IRONLAKE_M(dev)) {
ironlake_enable_drps(dev); ironlake_enable_drps(dev);
intel_init_emon(dev); intel_init_emon(dev);
......
Supports Markdown
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