---

yaml --- r: 228794 b: refs/heads/master c: c578027 h: refs/heads/master v: v3
git-mirror · Dec 7, 2010 · 841a51e · 841a51e
1 parent 06081cc
commit 841a51e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1a1c69762a14f50dd574a9cbabbfa1b1542f580e
+refs/heads/master: c57802706aad9f179f2219415717896b3c177845
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -5952,7 +5952,7 @@ void intel_enable_clock_gating(struct drm_device *dev)
 	 * GPU can automatically power down the render unit if given a page
 	 * to save state.
 	 */
-	if (IS_IRONLAKE_M(dev)) {
+	if (IS_IRONLAKE_M(dev) && 0) { /* XXX causes a failure during suspend */
 		if (dev_priv->renderctx == NULL)
 			dev_priv->renderctx = intel_alloc_context_page(dev);
 		if (dev_priv->renderctx) {