Commit ed4a5184 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

This reverts commit eb1711bb.

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: default avatarDirk Hohndel <>
Reported-by: default avatarRichard Eames <>
Reported-by: default avatarRocko Requin <>
Acked-by: default avatarDaniel Vetter <>
Cc: Dave Airlie <>
Cc: Chris Wilson <>
Cc: Keith Packard <>
Cc: Eric Anholt <>
Signed-off-by: default avatarLinus Torvalds <>
parent 64b3dcc3
......@@ -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)
return ret;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment