Mesa (master): freedreno/computerator: MERGEDREGS update

[GitLab Mirror]

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

Author: Rob Clark <robdclark at chromium.org>
Date:   Sat Jun 13 10:43:00 2020 -0700

freedreno/computerator: MERGEDREGS update

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

---

 src/freedreno/computerator/a6xx.c    | 3 ++-
 src/freedreno/computerator/ir3_asm.c | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/freedreno/computerator/a6xx.c b/src/freedreno/computerator/a6xx.c
index 6eff57d50ec..5cf491c6970 100644
--- a/src/freedreno/computerator/a6xx.c
+++ b/src/freedreno/computerator/a6xx.c
@@ -135,7 +135,8 @@ cs_program_emit(struct fd_ringbuffer *ring, struct kernel *kernel)
 	OUT_PKT4(ring, REG_A6XX_SP_CS_CTRL_REG0, 1);
 	OUT_RING(ring, A6XX_SP_CS_CTRL_REG0_THREADSIZE(thrsz) |
 		A6XX_SP_CS_CTRL_REG0_FULLREGFOOTPRINT(i->max_reg + 1) |
-		A6XX_SP_CS_CTRL_REG0_MERGEDREGS |
+		A6XX_SP_CS_CTRL_REG0_HALFREGFOOTPRINT(i->max_half_reg + 1) |
+		COND(v->mergedregs, A6XX_SP_CS_CTRL_REG0_MERGEDREGS) |
 		A6XX_SP_CS_CTRL_REG0_BRANCHSTACK(v->branchstack) |
 		COND(v->need_pixlod, A6XX_SP_CS_CTRL_REG0_PIXLODENABLE));
 
diff --git a/src/freedreno/computerator/ir3_asm.c b/src/freedreno/computerator/ir3_asm.c
index b68cd37a680..fd27212eb1e 100644
--- a/src/freedreno/computerator/ir3_asm.c
+++ b/src/freedreno/computerator/ir3_asm.c
@@ -38,6 +38,7 @@ ir3_asm_assemble(struct ir3_compiler *c, FILE *in)
 	struct ir3_shader_variant *v = calloc(1, sizeof(*v));
 	v->type = MESA_SHADER_COMPUTE;
 	v->shader = shader;
+	v->mergedregs = true;
 
 	kernel->v = v;