xf86-video-intel: 2 commits - src/sna/sna_accel.c src/sna/sna_dri.c tools/virtual.c

[Chris Wilson]

 src/sna/sna_accel.c |    6 ++++++
 src/sna/sna_dri.c   |    2 ++
 tools/virtual.c     |    2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit f01c5eae2a3d6efebe9332a8654303356e622bec
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Sep 5 17:48:20 2013 +0100

    intel-virtual-output: Reserve space for the '\0' in the sprintf
    
    Even though we don't use the trailing NUL byte for our comparisons,
    sprintf will write it, so we need make space for it.
    
    Reported-by: Severin Strobl <fd at severin-strobl.de>
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=68987
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/tools/virtual.c b/tools/virtual.c
index 8e241e5..41bc36e 100644
--- a/tools/virtual.c
+++ b/tools/virtual.c
@@ -2041,7 +2041,7 @@ static int first_display_wait_for_ack(struct context *ctx, int timeout, int id)
 {
 	struct display *display = ctx->display;
 	struct pollfd pfd;
-	char expect[5];
+	char expect[6]; /* "1234R\0" */
 
 	sprintf(expect, "%04xR", id);
 	DBG(("%s: wait for act '%c%c%c%c%c'\n",
commit e6bb553b7482de4d52b6914e8eac09f2e6014714
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Sep 5 14:42:18 2013 +0100

    sna: Add a DBG to track calls to SetScreenPixmap
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index e3adc60..4c8d700 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -15265,6 +15265,12 @@ sna_set_screen_pixmap(PixmapPtr pixmap)
 	PixmapPtr old_front = screen->devPrivate;
 	WindowPtr root;
 
+	DBG(("%s: changing from pixmap=%ld to pixmap=%ld, (sna->front=%ld)\n",
+	     __FUNCTION__,
+	     old_front ? (long)old_front->drawable.serialNumber : 0,
+	     pixmap ? (long)pixmap->drawable.serialNumber : 0,
+	     to_sna_from_pixmap(pixmap)->front ? (long)to_sna_from_pixmap(pixmap)->front->drawable.serialNumber : 0));
+
 	assert(to_sna_from_pixmap(pixmap) == to_sna_from_screen(screen));
 	assert(to_sna_from_pixmap(pixmap)->front == old_front);
 
diff --git a/src/sna/sna_dri.c b/src/sna/sna_dri.c
index e0a1fc0..5870452 100644
--- a/src/sna/sna_dri.c
+++ b/src/sna/sna_dri.c
@@ -287,6 +287,8 @@ sna_dri_create_buffer(DrawablePtr draw,
 		if (bo == NULL)
 			return NULL;
 
+		assert(sna_pixmap(pixmap) != NULL);
+
 		bo = ref(bo);
 		bpp = pixmap->drawable.bitsPerPixel;
 		if (pixmap == sna->front)