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

Commit 4f8a567c authored by Daniel Vetter's avatar Daniel Vetter Committed by Eric Anholt
Browse files

drm/i915: overlay: drop superflous gpu flushes 



Cache-coherency is maintained by gem. Drop these leftover MI_FLUSH
commands from the userspace code.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
parent 4667a4a5

drivers/gpu/drm/i915/intel_overlay.c

+5 −15
Original line number Diff line number Diff line
@@ -220,9 +220,7 @@ static int intel_overlay_on(struct intel_overlay *overlay) 
	overlay->active = 1;

	overlay->hw_wedged = NEEDS_WAIT_FOR_FLIP;



	BEGIN_LP_RING(6);

	OUT_RING(MI_FLUSH);

	OUT_RING(MI_NOOP);

	BEGIN_LP_RING(4);

	OUT_RING(MI_OVERLAY_FLIP | MI_OVERLAY_ON);

	OUT_RING(overlay->flip_addr | OFC_UPDATE);

	OUT_RING(MI_WAIT_FOR_EVENT | MI_WAIT_FOR_OVERLAY_FLIP);
@@ -262,9 +260,7 @@ static void intel_overlay_continue(struct intel_overlay *overlay, 
	if (tmp & (1 << 17))

		DRM_DEBUG("overlay underrun, DOVSTA: %x\n", tmp);



	BEGIN_LP_RING(4);

	OUT_RING(MI_FLUSH);

	OUT_RING(MI_NOOP);

	BEGIN_LP_RING(2);

	OUT_RING(MI_OVERLAY_FLIP | MI_OVERLAY_CONTINUE);

	OUT_RING(flip_addr);

        ADVANCE_LP_RING();
@@ -333,9 +329,7 @@ static int intel_overlay_off(struct intel_overlay *overlay) 
	/* wait for overlay to go idle */

	overlay->hw_wedged = SWITCH_OFF_STAGE_1;



	BEGIN_LP_RING(6);

	OUT_RING(MI_FLUSH);

	OUT_RING(MI_NOOP);

	BEGIN_LP_RING(4);

	OUT_RING(MI_OVERLAY_FLIP | MI_OVERLAY_CONTINUE);

	OUT_RING(flip_addr);

        OUT_RING(MI_WAIT_FOR_EVENT | MI_WAIT_FOR_OVERLAY_FLIP);
@@ -353,9 +347,7 @@ static int intel_overlay_off(struct intel_overlay *overlay) 
	/* turn overlay off */

	overlay->hw_wedged = SWITCH_OFF_STAGE_2;



	BEGIN_LP_RING(6);

        OUT_RING(MI_FLUSH);

        OUT_RING(MI_NOOP);

	BEGIN_LP_RING(4);

        OUT_RING(MI_OVERLAY_FLIP | MI_OVERLAY_OFF);

	OUT_RING(flip_addr);

        OUT_RING(MI_WAIT_FOR_EVENT | MI_WAIT_FOR_OVERLAY_FLIP);
@@ -430,9 +422,7 @@ int intel_overlay_recover_from_interrupt(struct intel_overlay *overlay, 


			overlay->hw_wedged = SWITCH_OFF_STAGE_2;



			BEGIN_LP_RING(6);

			OUT_RING(MI_FLUSH);

			OUT_RING(MI_NOOP);

			BEGIN_LP_RING(4);

			OUT_RING(MI_OVERLAY_FLIP | MI_OVERLAY_OFF);

			OUT_RING(flip_addr);

			OUT_RING(MI_WAIT_FOR_EVENT | MI_WAIT_FOR_OVERLAY_FLIP);