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

[GitLab Mirror]

Module: Mesa
Branch: staging/20.3
Commit: fe27a78d315f6e4471bb1cc8d081ff457aa984f6
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=fe27a78d315f6e4471bb1cc8d081ff457aa984f6

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>
(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 5c9ab07617e..7cd032cdfc1 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 bdb151ee96a..75419c440ea 100644
--- a/src/gallium/drivers/radeonsi/si_state_shaders.c
+++ b/src/gallium/drivers/radeonsi/si_state_shaders.c
@@ -3024,7 +3024,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;