freedreno/computerator: MERGEDREGS update

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

diff --git a/src/freedreno/computerator/a6xx.c b/src/freedreno/computerator/a6xx.c
index 6eff57d50ecf577d50459968ee5aa47ec42c7c90..5cf491c6970b35c203ba0e748a938143a35d0270 100644 (file)
--- 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 b68cd37a68045c12b0ce16401d616e27b3254c97..fd27212eb1ecabdf0c26341316ddd80903d8dc21 100644 (file)
--- 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;