Mesa (master): radeonsi: do VGT_FLUSH when switching NGG -> legacy on Sienna Cichlid

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: c4ebdf9ee7eac7241b5185d7d496e96384a41ecb
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c4ebdf9ee7eac7241b5185d7d496e96384a41ecb

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Mon Nov  9 17:54:44 2020 -0500

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 <pierre-eric.pelloux-prayer at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7542>

---

 src/gallium/drivers/radeonsi/si_state_shaders.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c
index 60441df8418..a83ef01d4fa 100644
--- a/src/gallium/drivers/radeonsi/si_state_shaders.c
+++ b/src/gallium/drivers/radeonsi/si_state_shaders.c
@@ -3032,7 +3032,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;