Mesa (staging/18.2): radeonsi: fix a VGT hang with primitive restart on Polaris10 and later

[GitLab Mirror]

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

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Tue Oct 16 15:10:01 2018 -0400

radeonsi: fix a VGT hang with primitive restart on Polaris10 and later

Cc: 18.1 18.2 <mesa-stable at lists.freedesktop.org>
Tested-by: Jakob Bornecrantz <jakob at collabora.com>
(cherry picked from commit eae8f49fc65e6e625f5e05d38c3bf1b61b84bd3d)

---

 src/gallium/drivers/radeonsi/si_state_draw.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_state_draw.c b/src/gallium/drivers/radeonsi/si_state_draw.c
index d901401f0b..4157e5ea3f 100644
--- a/src/gallium/drivers/radeonsi/si_state_draw.c
+++ b/src/gallium/drivers/radeonsi/si_state_draw.c
@@ -383,7 +383,7 @@ si_get_init_multi_vgt_param(struct si_screen *sscreen,
 		 * Polaris supports primitive restart with WD_SWITCH_ON_EOP=0
 		 * for points, line strips, and tri strips.
 		 */
-		if (sscreen->info.max_se < 4 ||
+		if (sscreen->info.max_se <= 2 ||
 		    key->u.prim == PIPE_PRIM_POLYGON ||
 		    key->u.prim == PIPE_PRIM_LINE_LOOP ||
 		    key->u.prim == PIPE_PRIM_TRIANGLE_FAN ||
@@ -414,7 +414,7 @@ si_get_init_multi_vgt_param(struct si_screen *sscreen,
 			wd_switch_on_eop = true;
 
 		/* Required on CIK and later. */
-		if (sscreen->info.max_se > 2 && !wd_switch_on_eop)
+		if (sscreen->info.max_se == 4 && !wd_switch_on_eop)
 			ia_switch_on_eoi = true;
 
 		/* Required by Hawaii and, for some special cases, by VI. */
@@ -429,6 +429,12 @@ si_get_init_multi_vgt_param(struct si_screen *sscreen,
 		    key->u.uses_instancing)
 			partial_vs_wave = true;
 
+		/* This only applies to Polaris10 and later 4 SE chips.
+		 * wd_switch_on_eop is already true on all other chips.
+		 */
+		if (!wd_switch_on_eop && key->u.primitive_restart)
+			partial_vs_wave = true;
+
 		/* If the WD switch is false, the IA switch must be false too. */
 		assert(wd_switch_on_eop || !ia_switch_on_eop);
 	}