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

Chris Wilson ickle at kemper.freedesktop.org
Mon Jun 23 03:48:57 PDT 2014


 src/sna/gen6_render.c |    1 +
 src/sna/gen7_render.c |    1 +
 src/sna/gen8_render.c |    1 +
 3 files changed, 3 insertions(+)

New commits:
commit 827b89fa2d5fca0ffd709c17bcdbfdaf95da918f
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Jun 23 11:44:22 2014 +0100

    sna/gen6+: Initialise src offset before use
    
    Fixes regression from
    
    commit 30348efd57135edee41fccb87133c572b6473aa8
    Author: Chris Wilson <chris at chris-wilson.co.uk>
    Date:   Mon Jun 23 11:14:25 2014 +0100
    
        sna/gen6+: Avoid adjusting copy coordinates until commited to using them
    
    which assumed that the render state was being zeroed.
    
    Reported-by: Jiri Slaby <jirislaby at gmail.com>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/gen6_render.c b/src/sna/gen6_render.c
index 2b4fd03..6ef26c8 100644
--- a/src/sna/gen6_render.c
+++ b/src/sna/gen6_render.c
@@ -2821,6 +2821,7 @@ fallback_blt:
 		tmp.src.bo = src_bo;
 		tmp.src.width  = src->drawable.width;
 		tmp.src.height = src->drawable.height;
+		tmp.src.offset[0] = tmp.src.offset[1] = 0;
 	}
 
 	tmp.mask.bo = NULL;
diff --git a/src/sna/gen7_render.c b/src/sna/gen7_render.c
index 1999aed..ce153e5 100644
--- a/src/sna/gen7_render.c
+++ b/src/sna/gen7_render.c
@@ -3056,6 +3056,7 @@ fallback_blt:
 		tmp.src.bo = src_bo;
 		tmp.src.width  = src->drawable.width;
 		tmp.src.height = src->drawable.height;
+		tmp.src.offset[0] = tmp.src.offset[1] = 0;
 	}
 
 	tmp.mask.bo = NULL;
diff --git a/src/sna/gen8_render.c b/src/sna/gen8_render.c
index f3ccb9b..53bac81 100644
--- a/src/sna/gen8_render.c
+++ b/src/sna/gen8_render.c
@@ -2880,6 +2880,7 @@ fallback_blt:
 		tmp.src.bo = src_bo;
 		tmp.src.width  = src->drawable.width;
 		tmp.src.height = src->drawable.height;
+		tmp.src.offset[0] = tmp.src.offset[1] = 0;
 	}
 
 	tmp.mask.bo = NULL;


More information about the xorg-commit mailing list