mesa: Branch 'master'

[Dave Airlie]

 src/mesa/drivers/dri/r300/r300_state.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

New commits:
diff-tree 64700be4e11ff735f0530812f6f319628e4b33c5 (from 159ecba4b335f09cb9345c67f48187db796f8955)
Author: Dave Airlie <airlied at nx6125b.(none)>
Date:   Tue Apr 10 11:46:58 2007 +0100

    rs480: set vap cntl to what fglrx uses for non-TCL cards

diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c
index 545b2f0..870d683 100644
--- a/src/mesa/drivers/dri/r300/r300_state.c
+++ b/src/mesa/drivers/dri/r300/r300_state.c
@@ -2005,8 +2005,10 @@ void r300ResetHwState(r300ContextPtr r30
 		/* Initialize magic registers
 		 TODO : learn what they really do, or get rid of
 		 those we don't have to touch */
-	r300->hw.vap_cntl.cmd[1] = 0x0030045A; //0x0030065a /* Dangerous */
-
+	if (!(r300->radeon.radeonScreen->chip_flags & RADEON_CHIPSET_TCL))
+		r300->hw.vap_cntl.cmd[1] = 0x0014045a;
+	else
+		r300->hw.vap_cntl.cmd[1] = 0x0030045A; //0x0030065a /* Dangerous */
 	r300->hw.vte.cmd[1] = R300_VPORT_X_SCALE_ENA
 				| R300_VPORT_X_OFFSET_ENA
 				| R300_VPORT_Y_SCALE_ENA