summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/drm/i915/i915_gem.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 60ff1b63b568..8359dc777041 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/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;
4-291-10/+10 | |\ | | * mac80211: default to automatic power controlJohannes Berg2009-04-291-0/+1 | | * mac80211: fix modprobe deadlock by not calling wep_init under rtnl_lockAlan Jenkins2009-04-291-10/+9 * | | net/9p: handle correctly interrupted 9P requestsLatchesar Ionkov2009-04-054-60/+30 * | | net/9p: return error when p9_client_stat failsLatchesar Ionkov2009-04-051-1/+5 * | | net/9p: set correct stat size when sending Twstat messagesLatchesar Ionkov2009-04-051-3/+31 * | | SUNRPC: Fix the problem of EADDRNOTAVAIL syslog floods on reconnectTrond Myklebust2009-05-022-9/+23 * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2009-04-29