---

yaml --- r: 228806 b: refs/heads/master c: b5ba177 h: refs/heads/master v: v3
git-mirror · Dec 14, 2010 · ac3c05c · ac3c05c
1 parent 820d5f0
commit ac3c05c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9097eef024db4f1850015e837a84aca0aa40a288
+refs/heads/master: b5ba177d8d71f011c23b1cabec99fdaddae65c4d
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -2000,7 +2000,6 @@ i915_do_wait_request(struct drm_device *dev, uint32_t seqno,
 		trace_i915_gem_request_wait_begin(dev, seqno);
 
 		ring->waiting_seqno = seqno;
-		ret = -ENODEV;
 		if (ring->irq_get(ring)) {
 			if (interruptible)
 				ret = wait_event_interruptible(ring->irq_queue,
@@ -2012,7 +2011,10 @@ i915_do_wait_request(struct drm_device *dev, uint32_t seqno,
 					   || atomic_read(&dev_priv->mm.wedged));
 
 			ring->irq_put(ring);
-		}
+		} else if (wait_for(i915_seqno_passed(ring->get_seqno(ring),
+						      seqno) ||
+				    atomic_read(&dev_priv->mm.wedged), 3000))
+			ret = -EBUSY;
 		ring->waiting_seqno = 0;
 
 		trace_i915_gem_request_wait_end(dev, seqno);