Commit 107f27a5 authored Dec 10, 2012 by Chris Wilson Committed by Daniel Vetter Dec 11, 2012

drm/i915: Open-code i915_gpu_idle() for handling seqno wrapping



The complication is that during seqno wrapping we must be extremely
careful not to write to any ring as that will require a new seqno, and
so would recurse back into the seqno wrap handler. So we cannot call
i915_gpu_idle() as that does additional work beyond simply retiring the
current set of requests, and instead must do the minimal work ourselves
during seqno wrapping.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

parent f72b3435

drivers/gpu/drm/i915/i915_gem.c

+8 −4

Original line number	Original line	Diff line number	Diff line
	@@ -1938,11 +1938,15 @@ i915_gem_handle_seqno_wrap(struct drm_device *dev)
	if (ret == 0)		if (ret == 0)
	return ret;		return ret;

	ret = i915_gpu_idle(dev);		/* Carefully retire all requests without writing to the rings */
			for_each_ring(ring, dev_priv, i) {
			ret = intel_ring_idle(ring);
	if (ret)		if (ret)
	return ret;		return ret;
			}
	i915_gem_retire_requests(dev);		i915_gem_retire_requests(dev);

			/* Finally reset hw state */
	for_each_ring(ring, dev_priv, i) {		for_each_ring(ring, dev_priv, i) {
	ret = intel_ring_handle_seqno_wrap(ring);		ret = intel_ring_handle_seqno_wrap(ring);
	if (ret)		if (ret)