---

yaml --- r: 307327 b: refs/heads/master c: 4146b08 h: refs/heads/master i: 307325: 3ae4693 307323: fe91103 307319: c9e332b 307311: 95719c7 307295: 9a52cc7 307263: 2cea056 307199: 34b6bcc v: v3
git-mirror · May 3, 2012 · 1444833 · 1444833
1 parent 4266a03
commit 1444833
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 604dd3ec75b2488dc81cd25dd85fcea23df25a9e
+refs/heads/master: 4146b08d767a702682bd28e2a21b062983fd937c
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -2996,11 +2996,8 @@ i915_gem_ring_throttle(struct drm_device *dev, struct drm_file *file)
 
 			if (ret == 0 && atomic_read(&dev_priv->mm.wedged))
 				ret = -EIO;
-		} else if (wait_for_atomic(i915_seqno_passed(ring->get_seqno(ring),
-							     seqno) ||
-				    atomic_read(&dev_priv->mm.wedged), 3000)) {
+		} else
 			ret = -EBUSY;
-		}
 	}
 
 	if (ret == 0)