xf86-video-intel: 3 commits - configure.ac src/sna/gen3_render.c src/sna/sna_accel.c src/sna/sna_display.c

[Chris Wilson]

 configure.ac          |    2 +-
 src/sna/gen3_render.c |    4 ++--
 src/sna/sna_accel.c   |    9 ++++++---
 src/sna/sna_display.c |   16 +++++++++++-----
 4 files changed, 20 insertions(+), 11 deletions(-)

New commits:
commit 693c1343ed29d8779ce3ad5c0e80fbe6d7d0689f
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Dec 5 11:09:39 2013 +0000

    sna: OsRegisterSigWrapper was only introduced in 1.6.99.900
    
    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 6145336..6fd77ad 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -416,7 +416,9 @@ static int sigtrap_handler(int sig)
 
 static void sigtrap_init(void)
 {
+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,6,99,900,0)
 	OsRegisterSigWrapper(sigtrap_handler);
+#endif
 }
 
 inline static bool
commit ba9a173d81514152cd1dac4f1df765be11a478ea
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Dec 5 11:06:59 2013 +0000

    configure: Correct closing ']'
    
    Too many closed, too few opened.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/configure.ac b/configure.ac
index e377584..dcb09fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -99,7 +99,7 @@ gen4asm=no
 if test "x$ASM" != "xno"; then
 	AC_ARG_WITH(gen4asm,
 		    AS_HELP_STRING([--with-gen4asm=PATH],
-				   [Path to intel-gen4asm binary]]]),
+				   [Path to intel-gen4asm binary]),
 		    [path="$withval"],
 		    [path=""])
 	if test -n "$path" ; then
commit 845b03ac110c22cff8b2653e76f6d974a628b776
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Dec 5 11:00:44 2013 +0000

    sna: Compilation fixes for squeeze
    
    Older version of glibc and valgrind require a slight massage.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/gen3_render.c b/src/sna/gen3_render.c
index b3ee567..348cb86 100644
--- a/src/sna/gen3_render.c
+++ b/src/sna/gen3_render.c
@@ -2669,8 +2669,8 @@ gen3_render_reset(struct sna *sna)
 	state->last_vertex_offset = 0;
 
 	if (sna->render.vbo && !kgem_bo_can_map(&sna->kgem, sna->render.vbo)) {
-		DBG(("%s: discarding vbo as next access will stall: %d\n",
-		     __FUNCTION__, sna->render.vbo->presumed_offset));
+		DBG(("%s: discarding vbo as next access will stall: %lx\n",
+		     __FUNCTION__, (long)sna->render.vbo->presumed_offset));
 		discard_vbo(sna);
 	}
 
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 622d87b..6145336 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -4241,9 +4241,8 @@ try_upload_blt(PixmapPtr pixmap, RegionRec *region,
 	src_bo->pitch = stride;
 	kgem_bo_mark_unreusable(src_bo);
 
-	DBG(("%s: upload(%d, %d, %d, %d) x %d through a temporary map\n",
-	     __FUNCTION__, x, y, w, h,
-	     RegionNumRects(region)));
+	DBG(("%s: upload(%d, %d, %d, %d) x %ld through a temporary map\n",
+	     __FUNCTION__, x, y, w, h, (long)RegionNumRects(region)));
 
 	if (sigtrap_get() == 0) {
 		ok = sna->render.copy_boxes(sna, GXcopy,
@@ -16502,7 +16501,9 @@ static void sna_accel_debug_memory(struct sna *sna)
 	       sna->debug_memory.cpu_bo_allocs,
 	       (long)sna->debug_memory.cpu_bo_bytes);
 
+#ifdef VALGRIND_DO_ADDED_LEAK_CHECK
 	VG(VALGRIND_DO_ADDED_LEAK_CHECK);
+#endif
 }
 
 #else
diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index ec1367d..77d34ae 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -2117,14 +2117,20 @@ sna_output_panel_edid(xf86OutputPtr output, DisplayModePtr modes)
 
 static char *canonical_mode_name(DisplayModePtr mode)
 {
-	char *str;
+	char tmp[32], *buf;
+	int len;
 
-	if (asprintf(&str, "%dx%d%s",
-		     mode->HDisplay, mode->VDisplay,
-		     mode->Flags & V_INTERLACE ? "i" : "") < 0)
+	len = sprintf(tmp, "%dx%d%s",
+		      mode->HDisplay, mode->VDisplay,
+		      mode->Flags & V_INTERLACE ? "i" : "");
+	if ((unsigned)len >= sizeof(tmp))
 		return NULL;
 
-	return str;
+	buf = malloc(len + 1);
+	if (buf == NULL)
+		return NULL;
+
+	return memcpy(buf, tmp, len + 1);
 }
 
 static DisplayModePtr