radeonsi: add a bug workaround for NGG - LATE_ALLOC_GS
authorMarek Olšák <marek.olsak@amd.com>
Tue, 3 Mar 2020 23:40:50 +0000 (18:40 -0500)
committerMarek Olšák <marek.olsak@amd.com>
Mon, 9 Mar 2020 20:08:10 +0000 (16:08 -0400)
Cc: 19.3 20.0 <mesa-stable@lists.freedesktop.org>
Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4079>

src/gallium/drivers/radeonsi/si_state_shaders.c

index ebb3fa30b8807ac1b08e08b8f936b1568b7befeb..448ea8c732bf463618acd9c0b4474334787e06f1 100644 (file)
@@ -1236,6 +1236,12 @@ static void gfx10_shader_ngg(struct si_screen *sscreen, struct si_shader *shader
        else
                late_alloc_wave64 = (num_cu_per_sh - 2) * 4;
 
+       /* Limit LATE_ALLOC_GS for prevent a hang (hw bug). */
+       if (sscreen->info.family == CHIP_NAVI10 ||
+           sscreen->info.family == CHIP_NAVI12 ||
+           sscreen->info.family == CHIP_NAVI14)
+               late_alloc_wave64 = MIN2(late_alloc_wave64, 64);
+
        si_pm4_set_reg(pm4, R_00B204_SPI_SHADER_PGM_RSRC4_GS,
                       S_00B204_CU_EN(0xffff) |
                       S_00B204_SPI_SHADER_LATE_ALLOC_GS_GFX10(late_alloc_wave64));