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

Commit 884ceace authored by Kenneth Graunke's avatar Kenneth Graunke Committed by Daniel Vetter
Browse files

drm/i915: Refactor Broadwell PIPE_CONTROL emission into a helper. 



We'll want to reuse this for a workaround.

Signed-off-by: default avatarKenneth Graunke <kenneth@whitecape.org>
Reviewed-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
[danvet: Rmove now unused int.]
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 69bbeb4a

drivers/gpu/drm/i915/intel_ringbuffer.c

+22 −15
Original line number Diff line number Diff line
@@ -379,13 +379,33 @@ gen7_render_ring_flush(struct intel_engine_cs *ring, 
	return 0;

}



static int

gen8_emit_pipe_control(struct intel_engine_cs *ring,

		       u32 flags, u32 scratch_addr)

{

	int ret;



	ret = intel_ring_begin(ring, 6);

	if (ret)

		return ret;



	intel_ring_emit(ring, GFX_OP_PIPE_CONTROL(6));

	intel_ring_emit(ring, flags);

	intel_ring_emit(ring, scratch_addr);

	intel_ring_emit(ring, 0);

	intel_ring_emit(ring, 0);

	intel_ring_emit(ring, 0);

	intel_ring_advance(ring);



	return 0;

}



static int

gen8_render_ring_flush(struct intel_engine_cs *ring,

		       u32 invalidate_domains, u32 flush_domains)

{

	u32 flags = 0;

	u32 scratch_addr = ring->scratch.gtt_offset + 2 * CACHELINE_BYTES;

	int ret;



	flags |= PIPE_CONTROL_CS_STALL;
@@ -404,20 +424,7 @@ gen8_render_ring_flush(struct intel_engine_cs *ring, 
		flags |= PIPE_CONTROL_GLOBAL_GTT_IVB;

	}



	ret = intel_ring_begin(ring, 6);

	if (ret)

		return ret;



	intel_ring_emit(ring, GFX_OP_PIPE_CONTROL(6));

	intel_ring_emit(ring, flags);

	intel_ring_emit(ring, scratch_addr);

	intel_ring_emit(ring, 0);

	intel_ring_emit(ring, 0);

	intel_ring_emit(ring, 0);

	intel_ring_advance(ring);



	return 0;



	return gen8_emit_pipe_control(ring, flags, scratch_addr);

}



static void ring_write_tail(struct intel_engine_cs *ring,