Mesa (master): radeonsi: fix a hang with DrawTransformFeedback on 4 SE chips

[Marek Olšák]

Module: Mesa
Branch: master
Commit: d3f4f6b2e9380a91ab61b93c55ab36106345e7b2
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d3f4f6b2e9380a91ab61b93c55ab36106345e7b2

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Wed Jun 24 11:58:50 2015 +0200

radeonsi: fix a hang with DrawTransformFeedback on 4 SE chips

Cc: 10.6 10.5 <mesa-stable at lists.freedesktop.org>
Acked-by: Christian König <christain.koenig at amd.com>
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

---

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

diff --git a/src/gallium/drivers/radeonsi/si_state_draw.c b/src/gallium/drivers/radeonsi/si_state_draw.c
index 2e77d85..e85ed15 100644
--- a/src/gallium/drivers/radeonsi/si_state_draw.c
+++ b/src/gallium/drivers/radeonsi/si_state_draw.c
@@ -139,6 +139,10 @@ static unsigned si_get_ia_multi_vgt_param(struct si_context *sctx,
 		    (info->indirect || info->instance_count > 1))
 			wd_switch_on_eop = true;
 
+		/* USE_OPAQUE doesn't work when WD_SWITCH_ON_EOP is 0. */
+		if (info->count_from_stream_output)
+			wd_switch_on_eop = true;
+
 		/* If the WD switch is false, the IA switch must be false too. */
 		assert(wd_switch_on_eop || !ia_switch_on_eop);
 	}