Commit ac82ea2e authored Oct 01, 2012 by Chris Wilson Committed by Daniel Vetter Oct 02, 2012

drm/i915: Actually invalidate the TLB for the SandyBridge HW contexts w/a



A side-effect of commit 7d54a904
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Fri Aug 10 10:18:10 2012 +0100

    drm/i915: Apply post-sync write for pipe control invalidates

was that only a request to emit invalidate flush would result in the
TLB being invalidated (since it requires synchronisation and so incurs a
performance penalty). However, the stated w/a for hardware contexts is
that the TLBs must be invalidated prior to a MI_SET_CONTEXT, yet the w/a
itself did not request the TLBs to be invalidated...

Note this w/a does not prevent the hard system hang I experience when
using hw contexts (with rc6 enabled) on SNB GT1.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

parent 3bc2913e

drivers/gpu/drm/i915/i915_gem_context.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -328,7 +328,7 @@ mi_set_context(struct intel_ring_buffer *ring,
		* itlb_before_ctx_switch.
		*/
		if (IS_GEN6(ring->dev) && ring->itlb_before_ctx_switch) {
		ret = ring->flush(ring, 0, 0);
		ret = ring->flush(ring, I915_GEM_GPU_DOMAINS, 0);
		if (ret)
		return ret;
		}