---

yaml --- r: 228819 b: refs/heads/master c: 5909a77 h: refs/heads/master i: 228817: c3d9a09 228815: 5ed290d v: v3
git-mirror · Dec 20, 2010 · 6a4f091 · 6a4f091
1 parent a89d594
commit 6a4f091
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 72bfa19c8deb4d1db5ad068c34fd580cb295cbe8
+refs/heads/master: 5909a77ac62cc042f94bd262016cf468a2f96022
diff --git a/trunk/drivers/gpu/drm/i915/i915_suspend.c b/trunk/drivers/gpu/drm/i915/i915_suspend.c
@@ -822,7 +822,9 @@ int i915_save_state(struct drm_device *dev)
 	if (IS_GEN6(dev))
 		gen6_disable_rps(dev);
 
+	/* XXX disabling the clock gating breaks suspend on gm45
 	intel_disable_clock_gating(dev);
+	 */
 
 	/* Cache mode state */
 	dev_priv->saveCACHE_MODE_0 = I915_READ(CACHE_MODE_0);