tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Revert "drm/i915: fix infinite recursion on unbind due to ilk vt-d w/a"

This reverts commit eb1711bb94991e93669c5a1b5f84f11be2d51ea1.

It blows up the i915 seqno tracking, resulting in the

BUG_ON(seqno == 0);

in i915_wait_request() triggering, which will cause lock-ups.

See for example
https://bugs.launchpad.net/ubuntu/+source/linux/+bug/903010
https://lkml.org/lkml/2011/12/14/395

Reported-requested-and-tested-by: Dirk Hohndel <dirk@hohndel.org>
Reported-by: Richard Eames <Richard.Eames@flinders.edu.au>
Reported-by: Rocko Requin <rockorequin@hotmail.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Dave Airlie <airlied@redhat.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Keith Packard <keithp@keithp.com>
Cc: Eric Anholt <eric@anholt.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Linus Torvalds ed4a5184 64b3dcc3

+1 -6
+1 -6
drivers/gpu/drm/i915/i915_gem.c
··· 2026 2026 * to handle this, the waiter on a request often wants an associated 2027 2027 * buffer to have made it to the inactive list, and we would need 2028 2028 * a separate wait queue to handle that. 2029 - * 2030 - * To avoid a recursion with the ilk VT-d workaround (that calls 2031 - * gpu_idle when unbinding objects with interruptible==false) don't 2032 - * retire requests in that case (because it might call unbind if the 2033 - * active list holds the last reference to the object). 2034 2029 */ 2035 - if (ret == 0 && dev_priv->mm.interruptible) 2030 + if (ret == 0) 2036 2031 i915_gem_retire_requests_ring(ring); 2037 2032 2038 2033 return ret;