From 166fc8e9f327dcf154a7e840dc66e8d21657377d Mon Sep 17 00:00:00 2001 From: Qiang Yu Date: Wed, 9 Feb 2022 09:40:22 +0800 Subject: [PATCH] radeonsi: workaround Specviewperf13 Catia hang on GFX9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The root cause is unknown but PAL always update IA_MULTI_VGT_PARAM whenever primitive type change. cc: mesa-stable Reviewed-by: Marek Olšák Singed-off-by: Qiang Yu Part-of: (cherry picked from commit fe560aeb12516e766335d416ba749b7572637274) --- .pick_status.json | 2 +- src/gallium/drivers/radeonsi/si_state_draw.cpp | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 25bc1bdd516..f581d41608f 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -40,7 +40,7 @@ "description": "radeonsi: workaround Specviewperf13 Catia hang on GFX9", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/gallium/drivers/radeonsi/si_state_draw.cpp b/src/gallium/drivers/radeonsi/si_state_draw.cpp index 114b53fa5fa..ce1836af8fa 100644 --- a/src/gallium/drivers/radeonsi/si_state_draw.cpp +++ b/src/gallium/drivers/radeonsi/si_state_draw.cpp @@ -1186,7 +1186,9 @@ static void si_emit_ia_multi_vgt_param(struct si_context *sctx, min_vertex_count); /* Draw state. */ - if (ia_multi_vgt_param != sctx->last_multi_vgt_param) { + if (ia_multi_vgt_param != sctx->last_multi_vgt_param || + /* Workaround for SpecviewPerf13 Catia hang on GFX9. */ + (GFX_VERSION == GFX9 && prim != sctx->last_prim)) { radeon_begin(cs); if (GFX_VERSION == GFX9)