From 5a37cd8569da5492b97b8d76a081362e4b60135d Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Sat, 21 Jan 2023 11:25:43 -0800 Subject: [PATCH] freedreno/a6xx: Don't double-write SP_CS_OBJ_START Also SP_CS_INSTRLEN. This is already done in fd6_emit_shader(). Signed-off-by: Rob Clark Part-of: --- src/gallium/drivers/freedreno/a6xx/fd6_compute.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_compute.c b/src/gallium/drivers/freedreno/a6xx/fd6_compute.c index 2e2501754f9..5428bc02b7a 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_compute.c +++ b/src/gallium/drivers/freedreno/a6xx/fd6_compute.c @@ -58,7 +58,7 @@ cs_program_emit(struct fd_context *ctx, struct fd_ringbuffer *ring, OUT_RING(ring, A6XX_HLSQ_CS_CNTL_CONSTLEN(v->constlen) | A6XX_HLSQ_CS_CNTL_ENABLED); - OUT_PKT4(ring, REG_A6XX_SP_CS_CONFIG, 2); + OUT_PKT4(ring, REG_A6XX_SP_CS_CONFIG, 1); OUT_RING(ring, A6XX_SP_CS_CONFIG_ENABLED | COND(v->bindless_tex, A6XX_SP_CS_CONFIG_BINDLESS_TEX) | COND(v->bindless_samp, A6XX_SP_CS_CONFIG_BINDLESS_SAMP) | @@ -66,8 +66,7 @@ cs_program_emit(struct fd_context *ctx, struct fd_ringbuffer *ring, COND(v->bindless_ubo, A6XX_SP_CS_CONFIG_BINDLESS_UBO) | A6XX_SP_CS_CONFIG_NIBO(ir3_shader_nibo(v)) | A6XX_SP_CS_CONFIG_NTEX(v->num_samp) | - A6XX_SP_CS_CONFIG_NSAMP(v->num_samp)); /* SP_VS_CONFIG */ - OUT_RING(ring, v->instrlen); /* SP_VS_INSTRLEN */ + A6XX_SP_CS_CONFIG_NSAMP(v->num_samp)); /* SP_CS_CONFIG */ OUT_PKT4(ring, REG_A6XX_SP_CS_CTRL_REG0, 1); OUT_RING(ring, @@ -112,11 +111,7 @@ cs_program_emit(struct fd_context *ctx, struct fd_ringbuffer *ring, A6XX_SP_CS_CNTL_1_THREADSIZE(thrsz)); } - OUT_PKT4(ring, REG_A6XX_SP_CS_OBJ_START, 2); - OUT_RELOC(ring, v->bo, 0, 0, 0); /* SP_CS_OBJ_START_LO/HI */ - - if (v->instrlen > 0) - fd6_emit_shader(ctx, ring, v); + fd6_emit_shader(ctx, ring, v); } static void