Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 075b3bba authored by Ben Widawsky's avatar Ben Widawsky Committed by Daniel Vetter
Browse files

drm/i915/bdw: Update MI_FLUSH_DW 



The code is more verbose than necessary for the reader's sake, hopefully
the compiler optimizes away the if.

Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarBen Widawsky <ben@bwidawsk.net>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 1c7a0623

drivers/gpu/drm/i915/intel_ringbuffer.c

+18 −4
Original line number Diff line number Diff line
@@ -1670,6 +1670,8 @@ static int gen6_bsd_ring_flush(struct intel_ring_buffer *ring, 
		return ret;



	cmd = MI_FLUSH_DW;

	if (INTEL_INFO(ring->dev)->gen >= 8)

		cmd += 1;

	/*

	 * Bspec vol 1c.5 - video engine command streamer:

	 * "If ENABLED, all TLBs will be invalidated once the flush
@@ -1681,8 +1683,13 @@ static int gen6_bsd_ring_flush(struct intel_ring_buffer *ring, 
			MI_FLUSH_DW_STORE_INDEX | MI_FLUSH_DW_OP_STOREDW;

	intel_ring_emit(ring, cmd);

	intel_ring_emit(ring, I915_GEM_HWS_SCRATCH_ADDR | MI_FLUSH_DW_USE_GTT);

	if (INTEL_INFO(ring->dev)->gen >= 8) {

		intel_ring_emit(ring, 0); /* upper addr */

		intel_ring_emit(ring, 0); /* value */

	} else  {

		intel_ring_emit(ring, 0);

		intel_ring_emit(ring, MI_NOOP);

	}

	intel_ring_advance(ring);

	return 0;

}
@@ -1764,6 +1771,8 @@ static int gen6_ring_flush(struct intel_ring_buffer *ring, 
		return ret;



	cmd = MI_FLUSH_DW;

	if (INTEL_INFO(ring->dev)->gen >= 8)

		cmd += 1;

	/*

	 * Bspec vol 1c.3 - blitter engine command streamer:

	 * "If ENABLED, all TLBs will be invalidated once the flush
@@ -1775,8 +1784,13 @@ static int gen6_ring_flush(struct intel_ring_buffer *ring, 
			MI_FLUSH_DW_OP_STOREDW;

	intel_ring_emit(ring, cmd);

	intel_ring_emit(ring, I915_GEM_HWS_SCRATCH_ADDR | MI_FLUSH_DW_USE_GTT);

	if (INTEL_INFO(ring->dev)->gen >= 8) {

		intel_ring_emit(ring, 0); /* upper addr */

		intel_ring_emit(ring, 0); /* value */

	} else  {

		intel_ring_emit(ring, 0);

		intel_ring_emit(ring, MI_NOOP);

	}

	intel_ring_advance(ring);



	if (IS_GEN7(dev) && flush)