Commit 4e0e90dc authored Dec 14, 2011 by Daniel Vetter Committed by Keith Packard Jan 03, 2012

drm/i915: kicking rings stuck on semaphores considered harmful



If our semaphore logic gets confused and we have a ring stuck waiting
for one, there's a decent chance it'll just execute garbage when being
kicked. Also, kicking the ring obscures the place where the error
first occured, making error_state decoding much harder.

So drop this an let gpu reset handle this mess in a clean fashion.

In contrast, kicking rings stuck on MI_WAIT is rather harmless, at
worst there'll be a bit of screen-flickering. There's also old
broken userspace out there which needs this as a  work-around.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Chris Wilson <chris@hchris-wilson.co.uk>
Reviewed-by: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: Keith Packard <keithp@keithp.com>

parent ae662d31

drivers/gpu/drm/i915/i915_irq.c

+0 −7

Original line number	Diff line number	Diff line
		@@ -1649,13 +1649,6 @@ static bool kick_ring(struct intel_ring_buffer *ring)
		I915_WRITE_CTL(ring, tmp);
		return true;
		}
		if (IS_GEN6(dev) &&
		(tmp & RING_WAIT_SEMAPHORE)) {
		DRM_ERROR("Kicking stuck semaphore on %s\n",
		ring->name);
		I915_WRITE_CTL(ring, tmp);
		return true;
		}
		return false;
		}