mesa: Branch 'master'

[Patrice Mandin]

 src/mesa/drivers/dri/nouveau/nv10_state.c |    8 ++++++++
 1 files changed, 8 insertions(+)

New commits:
diff-tree 296eeb882fa9fd7528f33ed307f87171dff7ee1c (from 63568745863a54308fecc32dbb96397c35b22496)
Author: Patrice Mandin <pmandin at caramail.com>
Date:   Sun Feb 4 13:10:23 2007 +0100

    nouveau: nv10: add init for unknown 0x120

diff --git a/src/mesa/drivers/dri/nouveau/nv10_state.c b/src/mesa/drivers/dri/nouveau/nv10_state.c
index 88c1d7d..8fbc76c 100644
--- a/src/mesa/drivers/dri/nouveau/nv10_state.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_state.c
@@ -659,6 +659,14 @@ static GLboolean nv10InitCard(nouveauCon
 	BEGIN_RING_SIZE(NvSub3D, 0x03f4, 1);
 	OUT_RING(0);
 
+	/* not for nv10, only for >= nv11 */
+	if ((nmesa->screen->card->id>>4) >= 0x11) {
+	        BEGIN_RING_SIZE(NvSub3D, 0x120, 3);
+        	OUT_RING(0);
+	        OUT_RING(1);
+	        OUT_RING(2);
+	}
+
 	return GL_TRUE;
 }