Mesa (staging/20.0): radeonsi/ngg: add VGT_FLUSH when enabling fast launch

[GitLab Mirror]

Module: Mesa
Branch: staging/20.0
Commit: 0dce180b4386860e18539c77c38afbcf57b8c37a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0dce180b4386860e18539c77c38afbcf57b8c37a

Author: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Date:   Thu Jan 30 12:16:46 2020 +0100

radeonsi/ngg: add VGT_FLUSH when enabling fast launch

(cherry-picked from 3da91b3327fb93d0364c0ca9d0216f695160831d)

Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3846>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3846>

---

 src/gallium/drivers/radeonsi/si_state_draw.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/gallium/drivers/radeonsi/si_state_draw.c b/src/gallium/drivers/radeonsi/si_state_draw.c
index 2f87896ead6..96fa59145ae 100644
--- a/src/gallium/drivers/radeonsi/si_state_draw.c
+++ b/src/gallium/drivers/radeonsi/si_state_draw.c
@@ -2080,6 +2080,11 @@ static void si_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *i
 		}
 
 		if (ngg_culling != sctx->ngg_culling) {
+			/* Insert a VGT_FLUSH when enabling fast launch changes to prevent hangs.
+			* See issues #2418, #2426, #2434
+			*/
+			if (ngg_culling & SI_NGG_CULL_GS_FAST_LAUNCH_ALL)
+				sctx->flags |= SI_CONTEXT_VGT_FLUSH;
 			sctx->ngg_culling = ngg_culling;
 			sctx->do_update_shaders = true;
 		}