summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_suspend.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2010-12-05 17:27:06 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2010-12-05 23:19:37 +0000
commit0cdab21f9a1fca50dd27e488839f5a6578e333b2 (patch)
treef13b61fa0f5beb17635311af85bdb657e97ee574 /drivers/gpu/drm/i915/i915_suspend.c
parent9b3826bf8420e7280d9fffa233d93a7b85dcb1db (diff)
downloadop-kernel-dev-0cdab21f9a1fca50dd27e488839f5a6578e333b2.zip
op-kernel-dev-0cdab21f9a1fca50dd27e488839f5a6578e333b2.tar.gz
drm/i915: Uncouple render/power ctx before suspending
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_suspend.c')
-rw-r--r--drivers/gpu/drm/i915/i915_suspend.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c
index 011325e..a311809 100644
--- a/drivers/gpu/drm/i915/i915_suspend.c
+++ b/drivers/gpu/drm/i915/i915_suspend.c
@@ -820,6 +820,8 @@ int i915_save_state(struct drm_device *dev)
if (HAS_PCH_SPLIT(dev))
ironlake_disable_drps(dev);
+ intel_disable_clock_gating(dev);
+
/* Cache mode state */
dev_priv->saveCACHE_MODE_0 = I915_READ(CACHE_MODE_0);
@@ -863,7 +865,7 @@ int i915_restore_state(struct drm_device *dev)
}
/* Clock gating state */
- intel_init_clock_gating(dev);
+ intel_enable_clock_gating(dev);
if (HAS_PCH_SPLIT(dev)) {
ironlake_enable_drps(dev);
OpenPOWER on IntegriCloud