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

[Emil Velikov]

Module: Mesa
Branch: 10.4
Commit: 53041aecef1bf41ca5f0eeab0d1504f24d7b1c81
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=53041aecef1bf41ca5f0eeab0d1504f24d7b1c81

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Wed Feb 18 11:57:43 2015 +0000

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>

(cherry picked from commit a27b74819ad375e8c0bc88e13f42c951d2b5cd6a)
[Emil Velikov: The file was renamed si_state_{shaders,draw}.c]
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>

Conflicts:
        src/gallium/drivers/radeonsi/si_state_shader.c

---

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

diff --git a/src/gallium/drivers/radeonsi/si_state_draw.c b/src/gallium/drivers/radeonsi/si_state_draw.c
index 3a65371..c85b1cc 100644
--- a/src/gallium/drivers/radeonsi/si_state_draw.c
+++ b/src/gallium/drivers/radeonsi/si_state_draw.c
@@ -545,8 +545,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,