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
Reported-requested-and-tested-by: Dirk Hohndel <firstname.lastname@example.org>
Reported-by: Richard Eames <Richard.Eames@flinders.edu.au>
Reported-by: Rocko Requin <email@example.com>
Acked-by: Daniel Vetter <firstname.lastname@example.org>
Cc: Dave Airlie <email@example.com>
Cc: Chris Wilson <firstname.lastname@example.org>
Cc: Keith Packard <email@example.com>
Cc: Eric Anholt <firstname.lastname@example.org>
Signed-off-by: Linus Torvalds <email@example.com>
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 60ff1b6..8359dc7 100644
@@ -2026,13 +2026,8 @@
* 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)