From 2fb418808d2e1b36bf377dbce49a58c03e918f15 Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Tue, 6 Dec 2011 12:12:33 +0100 Subject: [PATCH] --- yaml --- r: 276447 b: refs/heads/master c: eb1711bb94991e93669c5a1b5f84f11be2d51ea1 h: refs/heads/master i: 276445: 5facb757212f2c37f264009b72075544bfe5166d 276443: 6e3a400d0b765125bc02c835d2c879c24e466772 276439: 87def3420253ecdb1e3e9e2956007141197f9ea9 276431: 31b7cb1d1deb3c8399ac168b74bf41cf42f85f83 276415: 7d77c6e3e5f46ccb84eb0bea15318c5bcbd75c2b v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_gem.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 56a13dfc71a8..1f54696a62bc 100644 --- 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 index 8359dc777041..60ff1b63b568 100644 --- 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;