Mesa (master): freedreno/a6xx: enable SKIP_IB2_ENABLE properly

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: bab9db6c0263e74696f300520db6380ee0803322
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=bab9db6c0263e74696f300520db6380ee0803322

Author: Rob Clark <robdclark at chromium.org>
Date:   Fri Feb 21 08:42:12 2020 -0800

freedreno/a6xx: enable SKIP_IB2_ENABLE properly

Signed-off-by: Rob Clark <robdclark at chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3989>

---

 src/gallium/drivers/freedreno/a6xx/fd6_gmem.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_gmem.c b/src/gallium/drivers/freedreno/a6xx/fd6_gmem.c
index 6fc9b5c06eb..e884eb5b311 100644
--- a/src/gallium/drivers/freedreno/a6xx/fd6_gmem.c
+++ b/src/gallium/drivers/freedreno/a6xx/fd6_gmem.c
@@ -740,6 +740,10 @@ fd6_emit_tile_init(struct fd_batch *batch)
 	OUT_PKT7(ring, CP_SKIP_IB2_ENABLE_GLOBAL, 1);
 	OUT_RING(ring, 0x0);
 
+	/* blob controls "local" in IB2, but I think that is not required */
+	OUT_PKT7(ring, CP_SKIP_IB2_ENABLE_LOCAL, 1);
+	OUT_RING(ring, 0x1);
+
 	fd_wfi(batch, ring);
 	OUT_PKT4(ring, REG_A6XX_RB_CCU_CNTL, 1);
 	OUT_RING(ring, fd6_context(ctx)->magic.RB_CCU_CNTL_gmem);
@@ -1482,6 +1486,10 @@ fd6_emit_sysmem_prep(struct fd_batch *batch)
 	OUT_PKT7(ring, CP_SKIP_IB2_ENABLE_GLOBAL, 1);
 	OUT_RING(ring, 0x0);
 
+	/* blob controls "local" in IB2, but I think that is not required */
+	OUT_PKT7(ring, CP_SKIP_IB2_ENABLE_LOCAL, 1);
+	OUT_RING(ring, 0x1);
+
 	fd6_event_write(batch, ring, PC_CCU_INVALIDATE_COLOR, false);
 	fd6_cache_inv(batch, ring);