From 0a7014328f0fade4e2c3c129df5aad964a803203 Mon Sep 17 00:00:00 2001 From: Qiang Yu Date: Tue, 6 Jun 2023 10:04:52 +0800 Subject: [PATCH] radeonsi: add scratch_offset arg for aco cs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Marek Olšák Signed-off-by: Qiang Yu Part-of: --- src/gallium/drivers/radeonsi/si_shader.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index b4524aaf453..5fd58d338bc 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -750,6 +750,10 @@ void si_init_shader_args(struct si_shader *shader, struct si_shader_args *args) if (shader->selector->info.uses_subgroup_info) ac_add_arg(&args->ac, AC_ARG_SGPR, 1, AC_ARG_INT, &args->ac.tg_size); + /* GFX11 set FLAT_SCRATCH directly instead of using this arg. */ + if (shader->use_aco && sel->screen->info.gfx_level < GFX11) + ac_add_arg(&args->ac, AC_ARG_SGPR, 1, AC_ARG_INT, &args->ac.scratch_offset); + /* Hardware VGPRs. */ /* Thread IDs are packed in VGPR0, 10 bits per component or stored in 3 separate VGPRs */ if (sel->screen->info.gfx_level >= GFX11 ||