---

yaml --- r: 276789 b: refs/heads/master c: ed4a518 h: refs/heads/master i: 276787: 5ad28e9 v: v3
git-mirror · Dec 16, 2011 · 994c783 · 994c783
1 parent ee68d26
commit 994c783
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 64b3dcc35e8dcaa3032aa6aba416d05f41ead959
+refs/heads/master: ed4a51842a9d9e618d4f4c31349b15b974dba5df
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -2026,13 +2026,8 @@ 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 && dev_priv->mm.interruptible)
+	if (ret == 0)
 		i915_gem_retire_requests_ring(ring);
 
 	return ret;