From 1044a89f5d5786ee722c069b19d434c8346672ce Mon Sep 17 00:00:00 2001
From: Ben Widawsky <ben@bwidawsk.net>
Date: Tue, 24 Jan 2012 20:36:15 -0800
Subject: [PATCH] --- yaml --- r: 293545 b: refs/heads/master c:
 8436473a4b10243fd4c3009b97b6646c2ba642f7 h: refs/heads/master i:   293543:
 f5af6aaf0b4014361d5309f10dc9e84c036f3cca v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d9f269cfb1a3..bba630d0be21 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b93f9cf14e714c20ce9a544ed1a6070ee7604588
+refs/heads/master: 8436473a4b10243fd4c3009b97b6646c2ba642f7
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem_gtt.c b/trunk/drivers/gpu/drm/i915/i915_gem_gtt.c
index e050b903da95..11bddd5a5a6a 100644
--- a/trunk/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/trunk/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -55,7 +55,7 @@ static bool do_idling(struct drm_i915_private *dev_priv)
 
 	if (unlikely(dev_priv->mm.gtt->do_idle_maps)) {
 		dev_priv->mm.interruptible = false;
-		if (i915_gpu_idle(dev_priv->dev, true)) {
+		if (i915_gpu_idle(dev_priv->dev, false)) {
 			DRM_ERROR("Couldn't idle GPU\n");
 			/* Wait a bit, in hopes it avoids the hang */
 			udelay(10);