xf86-video-intel: src/sna/gen2_render.c

[Chris Wilson]

 src/sna/gen2_render.c |   18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

New commits:
commit 3b5971bd2359383cb8326702d80e03bc15d34c69
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Jul 5 22:20:28 2011 +0100

    sna/gen2: Restore invariant ENABLES
    
    One deletion too many, unnoticed until the next reboot. Besides the
    failure to disable logic op and enable colour buffer blending which
    causes a hang if you subsequently try to enable both, you also need
    to request texture caching...
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/gen2_render.c b/src/sna/gen2_render.c
index ccee626..e6d6fe3 100644
--- a/src/sna/gen2_render.c
+++ b/src/sna/gen2_render.c
@@ -510,6 +510,24 @@ static void gen2_emit_invariant(struct sna *sna)
 		  ENABLE_SRC_BLND_FACTOR | SRC_BLND_FACT(BLENDFACTOR_ONE) |
 		  ENABLE_DST_BLND_FACTOR | DST_BLND_FACT(BLENDFACTOR_ZERO));
 
+	OUT_BATCH(_3DSTATE_ENABLES_1_CMD |
+		  DISABLE_LOGIC_OP |
+		  DISABLE_STENCIL_TEST |
+		  DISABLE_DEPTH_BIAS |
+		  DISABLE_SPEC_ADD |
+		  DISABLE_FOG |
+		  DISABLE_ALPHA_TEST |
+		  DISABLE_DEPTH_TEST |
+		  ENABLE_COLOR_BLEND);
+
+	OUT_BATCH(_3DSTATE_ENABLES_2_CMD |
+		  DISABLE_STENCIL_WRITE |
+		  DISABLE_DITHER |
+		  DISABLE_DEPTH_WRITE |
+		  ENABLE_COLOR_MASK |
+		  ENABLE_COLOR_WRITE |
+		  ENABLE_TEX_CACHE);
+
 	sna->render_state.gen2.need_invariant = FALSE;
 }