---

yaml --- r: 276447 b: refs/heads/master c: eb1711b h: refs/heads/master i: 276445: 5facb75 276443: 6e3a400 276439: 87def34 276431: 31b7cb1 276415: 7d77c6e v: v3
git-mirror · Dec 7, 2011 · 2fb4188 · 2fb4188
1 parent 60aed81
commit 2fb4188
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc87cd5c264cb587f16459285565830689ecf7a7
+refs/heads/master: eb1711bb94991e93669c5a1b5f84f11be2d51ea1
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -2026,8 +2026,13 @@ i915_wait_request(struct intel_ring_buffer *ring,
 	 * to handle this, the waiter on a request often wants an associated
 	 * buffer to have made it to the inactive list, and we would need
 	 * a separate wait queue to handle that.
+	 *
+	 * To avoid a recursion with the ilk VT-d workaround (that calls
+	 * gpu_idle when unbinding objects with interruptible==false) don't
+	 * retire requests in that case (because it might call unbind if the
+	 * active list holds the last reference to the object).
 	 */
-	if (ret == 0)
+	if (ret == 0 && dev_priv->mm.interruptible)
 		i915_gem_retire_requests_ring(ring);
 
 	return ret;