Module: Mesa Branch: staging/20.0 Commit: 0f437dd2615dd6e9b8a64aa9081f67a77b28ecd2 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0f437dd2615dd6e9b8a64aa9081f67a77b28ecd2
Author: Marek Olšák <marek.ol...@amd.com> Date: Tue Mar 3 18:40:50 2020 -0500 radeonsi: add a bug workaround for NGG - LATE_ALLOC_GS Cc: 19.3 20.0 <mesa-sta...@lists.freedesktop.org> Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-pra...@amd.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4079> (cherry picked from commit 7481c4be583493374925dbe53703f992616ce91c) --- .pick_status.json | 2 +- src/gallium/drivers/radeonsi/si_state_shaders.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 9517f42b2b4..bff822a9837 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -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 }, diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c index fcf99088164..fca7d71dae7 100644 --- a/src/gallium/drivers/radeonsi/si_state_shaders.c +++ b/src/gallium/drivers/radeonsi/si_state_shaders.c @@ -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)); _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit
