radeonsi: do VGT_FLUSH when switching NGG -> legacy on Sienna Cichlid

Other chips don't need this.

Fixes: 9538b9a68e - radeonsi: add support for Sienna Cichlid

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7542>
(cherry picked from commit c4ebdf9ee7)
This commit is contained in:
Marek Olšák 2020-11-09 17:54:44 -05:00 committed by Dylan Baker
parent 6a6f94e9ec
commit 547332b50f
2 changed files with 2 additions and 2 deletions

View file

@ -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"
},

View file

@ -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;