summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Olšák <marek.olsak@amd.com>2015-06-24 11:58:50 +0200
committerEmil Velikov <emil.l.velikov@gmail.com>2015-07-08 13:34:06 +0100
commit03cf14a71378eec10d8c496916c0bc0ff212ef7d (patch)
treec5c773f7892ee10eb927ad912df4088dda99b01d
parente529d5ffb4c0b951005948d06e8ce868f5659c24 (diff)
radeonsi: fix a hang with DrawTransformFeedback on 4 SE chips
Cc: 10.6 10.5 <mesa-stable@lists.freedesktop.org> Acked-by: Christian König <christain.koenig@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> (cherry picked from commit d3f4f6b2e9380a91ab61b93c55ab36106345e7b2)
-rw-r--r--src/gallium/drivers/radeonsi/si_state_draw.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gallium/drivers/radeonsi/si_state_draw.c b/src/gallium/drivers/radeonsi/si_state_draw.c
index 2e77d85a80d..e85ed15deb7 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);
}