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

[Chris Wilson]

 src/sna/gen7_render.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 7927f9a351ead1a5593bc91e465706bdd889bb8d
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Oct 16 17:56:30 2012 +0100

    sna/gen7: Filter BLEND flags for CA glyphs
    
    Fixes regression from commit c51aaa731e5cffc892e59730194ad7c98789b02b
    Author: Chris Wilson <chris at chris-wilson.co.uk>
    Date:   Thu Oct 11 11:36:00 2012 +0100
    
        sna/gen7: Replace bogus state tracking assertion
    
    The assumption being that we only used the encoded flags for determining
    the composite state is false for the magic CA pass.
    
    Reported-by: Oleksij Rempel <bug-track at fisher-privat.net>
    Reported-by: Eyal Lotem <eyal.lotem at gmail.com>
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=56037
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/gen7_render.c b/src/sna/gen7_render.c
index 4d94c80..c3639f6 100644
--- a/src/sna/gen7_render.c
+++ b/src/sna/gen7_render.c
@@ -1077,7 +1077,9 @@ static void gen7_magic_ca_pass(struct sna *sna,
 
 	gen7_emit_pipe_invalidate(sna);
 
-	gen7_emit_cc(sna, gen7_get_blend(PictOpAdd, true, op->dst.format));
+	gen7_emit_cc(sna,
+		     GEN7_BLEND(gen7_get_blend(PictOpAdd, true,
+					       op->dst.format)));
 	gen7_emit_wm(sna,
 		     gen7_choose_composite_kernel(PictOpAdd,
 						  true, true,