summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Olšák <marek.olsak@amd.com>2017-05-05 17:05:05 +0200
committerAndres Gomez <agomez@igalia.com>2017-05-12 21:54:56 +0300
commiteaddabb6973ab1988cb0582c7af2035e9be220a8 (patch)
treeb337f96f7a3141eb42eb39b98007a72144e3506d
parent6c9734a13d201cf00441f02bf21756704bdee09f (diff)
radeonsi: apply the tess+GS hang workaround to Polaris12 as well
Cc: 17.1 <mesa-stable@lists.freedesktop.org> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com> (cherry picked from commit ee5908396e4b0d4be64d8bc486d25c2e95b7fd71) [Andres Gomez: resolve trivial conflicts] Signed-off-by: Andres Gomez <agomez@igalia.com> Conflicts: src/gallium/drivers/radeonsi/si_state_draw.c
-rw-r--r--src/gallium/drivers/radeonsi/si_state_draw.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gallium/drivers/radeonsi/si_state_draw.c b/src/gallium/drivers/radeonsi/si_state_draw.c
index 3aa2ecd7229..b72626f656a 100644
--- a/src/gallium/drivers/radeonsi/si_state_draw.c
+++ b/src/gallium/drivers/radeonsi/si_state_draw.c
@@ -319,7 +319,8 @@ static unsigned si_get_ia_multi_vgt_param(struct si_context *sctx,
if (sctx->b.family == CHIP_TONGA ||
sctx->b.family == CHIP_FIJI ||
sctx->b.family == CHIP_POLARIS10 ||
- sctx->b.family == CHIP_POLARIS11)
+ sctx->b.family == CHIP_POLARIS11 ||
+ sctx->b.family == CHIP_POLARIS12)
partial_vs_wave = true;
} else {
partial_vs_wave = true;