From fab5d33190eab215b485977f2bc2f7bddd77d59a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Tue, 7 Feb 2023 22:48:41 -0500 Subject: [PATCH] radeonsi/gfx11: don't set non-existent VGT_STRMOUT_BUFFER_CONFIG Fixes: 9fecac091f3 - radeonsi/gfx11: scattered register deltas Reviewed-by: Pierre-Eric Pelloux-Prayer Part-of: (cherry picked from commit c54635a0333bb225e2d52113e697bcf444abecc1) --- .pick_status.json | 2 +- src/gallium/drivers/radeonsi/si_state.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index f5fa733c84a..83cd043fce4 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1021,7 +1021,7 @@ "description": "radeonsi/gfx11: don't set non-existent VGT_STRMOUT_BUFFER_CONFIG", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "9fecac091f3159eb50a3e3dea2312218bb87d8c1" }, diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index fb4ea2e051d..f3a263f72fa 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -5593,9 +5593,9 @@ void si_init_cs_preamble_state(struct si_context *sctx, bool uses_reg_shadowing) si_pm4_set_reg(pm4, R_028AC8_DB_PRELOAD_CONTROL, 0x0); si_pm4_set_reg(pm4, R_02800C_DB_RENDER_OVERRIDE, 0); si_pm4_set_reg(pm4, R_028A8C_VGT_PRIMITIVEID_RESET, 0x0); - si_pm4_set_reg(pm4, R_028B98_VGT_STRMOUT_BUFFER_CONFIG, 0x0); if (sctx->gfx_level < GFX11) { + si_pm4_set_reg(pm4, R_028B98_VGT_STRMOUT_BUFFER_CONFIG, 0x0); si_pm4_set_reg(pm4, R_028A5C_VGT_GS_PER_VS, 0x2); si_pm4_set_reg(pm4, R_028AB8_VGT_VTX_CNT_EN, 0x0); }