radeonsi: add a bug workaround for NGG - LATE_ALLOC_GS

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>
(cherry picked from commit 7481c4be58)
This commit is contained in:
Marek Olšák 2020-03-03 18:40:50 -05:00 committed by Eric Engestrom
parent 1e3edbfbd3
commit 0f437dd261
2 changed files with 7 additions and 1 deletions

View file

@ -220,7 +220,7 @@
"description": "radeonsi: add a bug workaround for NGG - LATE_ALLOC_GS",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": null
},

View file

@ -1233,6 +1233,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));