From 547332b50f6426b5e7a6dc2683a2703a85132389 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Mon, 9 Nov 2020 17:54:44 -0500 Subject: [PATCH] radeonsi: do VGT_FLUSH when switching NGG -> legacy on Sienna Cichlid Other chips don't need this. Fixes: 9538b9a68ed - radeonsi: add support for Sienna Cichlid Acked-by: Pierre-Eric Pelloux-Prayer Part-of: (cherry picked from commit c4ebdf9ee7eac7241b5185d7d496e96384a41ecb) --- .pick_status.json | 2 +- src/gallium/drivers/radeonsi/si_state_shaders.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 7c0eeb3d88b..cc5b3ade48c 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -706,7 +706,7 @@ "description": "radeonsi: do VGT_FLUSH when switching NGG -> legacy on Sienna Cichlid", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "9538b9a68ed9aa0f8a231d6bf681f6f0a2a9d341" }, diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c index 327cf578ede..d9a71dc6776 100644 --- a/src/gallium/drivers/radeonsi/si_state_shaders.c +++ b/src/gallium/drivers/radeonsi/si_state_shaders.c @@ -2954,7 +2954,7 @@ bool si_update_ngg(struct si_context *sctx) * VGT_FLUSH is also emitted at the beginning of IBs when legacy GS ring * pointers are set. */ - if (sctx->chip_class == GFX10 && !new_ngg) + if ((sctx->chip_class == GFX10 || sctx->family == CHIP_SIENNA_CICHLID) && !new_ngg) sctx->flags |= SI_CONTEXT_VGT_FLUSH; sctx->ngg = new_ngg;