radeonsi: strenthen the ngg->legacy hw workaround, fix fast launch hangs too

Cc: 20.1 20.2 <mesa-stable@lists.freedesktop.org>

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13048>
This commit is contained in:
Marek Olšák
2021-09-26 04:29:57 -04:00
committed by Marge Bot
parent 279cd5821c
commit e40bd61588
+6 -2
View File
@@ -358,8 +358,12 @@ void si_begin_new_gfx_cs(struct si_context *ctx, bool first_cs)
SI_CONTEXT_INV_L2 | SI_CONTEXT_START_PIPELINE_STATS;
ctx->pipeline_stats_enabled = -1;
/* We don't know if the last draw used NGG. */
if (ctx->screen->info.has_vgt_flush_ngg_legacy_bug)
/* We don't know if the last draw used NGG or NGG fast launch because it can be a different
* process. When switching NGG->legacy or NGG->FAST_LAUNCH, we need to flush VGT for certain
* hw generations.
*/
if ((ctx->screen->info.has_vgt_flush_ngg_legacy_bug && !ctx->ngg) ||
(ctx->chip_class == GFX10 && ctx->ngg_culling & SI_NGG_CULL_GS_FAST_LAUNCH_ALL))
ctx->flags |= SI_CONTEXT_VGT_FLUSH;
if (ctx->border_color_buffer) {