From: Rob Clark <robdclark@gmail.com>
Date: Tue, 30 May 2017 15:19:12 +0000 (-0400)
Subject: freedreno/a5xx: drop WFIs in emit_marker5()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=45e97c994bb5019dd1be35cc76216a4774c8b2b6;p=mesa.git

freedreno/a5xx: drop WFIs in emit_marker5()

Results in always having at least one WFI between draws, which was
slowing stk down by ~5% and ~10% in xonotic.

(also drop bogus assert while we're at it.)

Signed-off-by: Rob Clark <robdclark@gmail.com>
---

diff --git a/src/gallium/drivers/freedreno/freedreno_util.h b/src/gallium/drivers/freedreno/freedreno_util.h
index 6b0fb700d6a..a0e1334e788 100644
--- a/src/gallium/drivers/freedreno/freedreno_util.h
+++ b/src/gallium/drivers/freedreno/freedreno_util.h
@@ -410,13 +410,8 @@ emit_marker5(struct fd_ringbuffer *ring, int scratch_idx)
 	extern unsigned marker_cnt;
 //XXX	unsigned reg = REG_A5XX_CP_SCRATCH_REG(scratch_idx);
 	unsigned reg = 0x00000b78 + scratch_idx;
-	assert(reg != HW_QUERY_BASE_REG);
-	if (reg == HW_QUERY_BASE_REG)
-		return;
-	OUT_WFI5(ring);
 	OUT_PKT4(ring, reg, 1);
 	OUT_RING(ring, ++marker_cnt);
-	OUT_WFI5(ring);
 }
 
 /* helper to get numeric value from environment variable..  mostly