xf86-video-intel: 2 commits - src/sna/sna_composite.c src/sna/sna_display.c

[Chris Wilson]

 src/sna/sna_composite.c |   14 +++++++++++++-
 src/sna/sna_display.c   |    3 +++
 2 files changed, 16 insertions(+), 1 deletion(-)

New commits:
commit f39d9ed0929f83e65dde8da8f03fae6ba8264e4a
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sat Jul 20 18:08:22 2013 +0100

    sna: Correct typo in checking src extents before performing memcpy
    
    A regression in
    commit 6921abd81017c9ed7f3b2413784068fbc609a0ea
    Author: Chris Wilson <chris at chris-wilson.co.uk>
    Date:   Thu Jul 18 16:21:27 2013 +0100
    
        sna: Add a fast path for the most common fallback for CPU-CPU blits
    
    And add the full set of assertions to validate the memcpy.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_composite.c b/src/sna/sna_composite.c
index 3cd8269..38f1219 100644
--- a/src/sna/sna_composite.c
+++ b/src/sna/sna_composite.c
@@ -530,7 +530,7 @@ sna_composite_fb(CARD8 op,
 	    region->extents.x1 + src_x + tx >= 0 &&
 	    region->extents.y1 + src_y + ty >= 0 &&
 	    region->extents.x2 + src_x + tx <= src->pDrawable->width &&
-	    region->extents.x2 + src_y + ty <= src->pDrawable->height) {
+	    region->extents.y2 + src_y + ty <= src->pDrawable->height) {
 		PixmapPtr dst_pixmap = get_drawable_pixmap(dst->pDrawable);
 		PixmapPtr src_pixmap = get_drawable_pixmap(src->pDrawable);
 		int nbox = RegionNumRects(region);
@@ -545,6 +545,18 @@ sna_composite_fb(CARD8 op,
 			dst_x += tx, dst_y += ty;
 
 		do {
+			assert(box->x1 + src_x >= 0);
+			assert(box->x2 + src_x <= src_pixmap->drawable.width);
+			assert(box->y1 + src_y >= 0);
+			assert(box->y2 + src_y <= src_pixmap->drawable.height);
+
+			assert(box->x1 + dst_x >= 0);
+			assert(box->x2 + dst_x <= dst_pixmap->drawable.width);
+			assert(box->y1 + dst_y >= 0);
+			assert(box->y2 + dst_y <= dst_pixmap->drawable.height);
+
+			assert(box->x2 > box->x1 && box->y2 > box->y1);
+
 			memcpy_blt(src_pixmap->devPrivate.ptr,
 				   dst_pixmap->devPrivate.ptr,
 				   dst_pixmap->drawable.bitsPerPixel,
commit f915d4a224eb686ad18b62ca0258e056b4a483cc
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sat Jul 20 15:26:04 2013 +0100

    sna: Inform the upper layers that we turn the CRTC on after a modeset
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 010f5fa..6f037ac 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -749,6 +749,9 @@ sna_crtc_force_outputs_on(xf86CrtcPtr crtc)
 	}
 
 	to_sna_crtc(crtc)->dpms_mode = DPMSModeOn;
+#if XF86_CRTC_VERSION >= 3
+	crtc->active = TRUE;
+#endif
 }
 
 static bool