From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Tue, 7 Dec 2010 23:04:14 +0000 (+0000)
Subject: drm/i915: Disable renderctx powersaving support for Ironlake
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=c57802706aad9f179f2219415717896b3c177845;p=deliverable%2Flinux.git

drm/i915: Disable renderctx powersaving support for Ironlake

... still causes a failure during suspend.

Reported-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 31fc1d797f8f..1ccf2ad7cd88 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/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) {