Mesa (master): radeonsi: only apply the instancing bug workaround to Bonaire

[Marek Olšák]

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

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Sun Oct 18 21:51:41 2015 +0200

radeonsi: only apply the instancing bug workaround to Bonaire

Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>

---

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

diff --git a/src/gallium/drivers/radeonsi/si_state_draw.c b/src/gallium/drivers/radeonsi/si_state_draw.c
index 96448ee..1aa5456 100644
--- a/src/gallium/drivers/radeonsi/si_state_draw.c
+++ b/src/gallium/drivers/radeonsi/si_state_draw.c
@@ -296,6 +296,11 @@ static unsigned si_get_ia_multi_vgt_param(struct si_context *sctx,
 		if (sctx->b.screen->info.max_se > 2 && !wd_switch_on_eop)
 			ia_switch_on_eoi = true;
 
+		/* Instancing bug on Bonaire. */
+		if (sctx->b.family == CHIP_BONAIRE && ia_switch_on_eoi &&
+		    (info->indirect || info->instance_count > 1))
+			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);
 	}
@@ -308,11 +313,6 @@ static unsigned si_get_ia_multi_vgt_param(struct si_context *sctx,
 	      u_prims_for_vertices(info->mode, info->count) <= 1)))
 		sctx->b.flags |= SI_CONTEXT_VGT_FLUSH;
 
-	/* Instancing bug on 2 SE chips. */
-	if (sctx->b.screen->info.max_se == 2 && ia_switch_on_eoi &&
-	    (info->indirect || info->instance_count > 1))
-		partial_vs_wave = true;
-
 	return S_028AA8_SWITCH_ON_EOP(ia_switch_on_eop) |
 		S_028AA8_SWITCH_ON_EOI(ia_switch_on_eoi) |
 		S_028AA8_PARTIAL_VS_WAVE_ON(partial_vs_wave) |