Mesa (master): radeonsi: small fix in SPI state

[Marek Olšák]

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

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Fri Feb  6 18:00:50 2015 +0100

radeonsi: small fix in SPI state

Cc: 10.5 10.4 <mesa-stable at lists.freedesktop.org>
Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>

---

 src/gallium/drivers/radeonsi/si_state_shaders.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c
index 27ccc8e..dea99ea 100644
--- a/src/gallium/drivers/radeonsi/si_state_shaders.c
+++ b/src/gallium/drivers/radeonsi/si_state_shaders.c
@@ -662,8 +662,10 @@ bcolor:
 		}
 
 		if (j == vsinfo->num_outputs) {
-			/* No corresponding output found, load defaults into input */
-			tmp |= S_028644_OFFSET(0x20);
+			/* No corresponding output found, load defaults into input.
+			 * Don't set any other bits.
+			 * (FLAT_SHADE=1 completely changes behavior) */
+			tmp = S_028644_OFFSET(0x20);
 		}
 
 		si_pm4_set_reg(pm4,