---

yaml --- r: 293545 b: refs/heads/master c: 8436473 h: refs/heads/master i: 293543: f5af6aa v: v3
git-mirror · Jan 26, 2012 · 1044a89 · 1044a89
1 parent e1cb7ab
commit 1044a89
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: 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
@@ -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);