xf86-video-intel: src/sna/blt.c src/sna/kgem.h src/sna/sna_driver.c src/sna/sna.h

[Chris Wilson]

 src/sna/blt.c        |    2 +-
 src/sna/kgem.h       |    2 +-
 src/sna/sna.h        |    2 +-
 src/sna/sna_driver.c |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit cd3d86037746f3a03c4004c1e3ba6e8281344745
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Nov 6 11:13:27 2011 +0000

    sna: Beware unsigned promotion of int16_t to uint32_t
    
    Mmakes for an unhappy mempy!
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/blt.c b/src/sna/blt.c
index 075ac8a..5dc318c 100644
--- a/src/sna/blt.c
+++ b/src/sna/blt.c
@@ -38,7 +38,7 @@
 
 void
 memcpy_blt(const void *src, void *dst, int bpp,
-	   uint32_t src_stride, uint32_t dst_stride,
+	   int32_t src_stride, int32_t dst_stride,
 	   int16_t src_x, int16_t src_y,
 	   int16_t dst_x, int16_t dst_y,
 	   uint16_t width, uint16_t height)
diff --git a/src/sna/kgem.h b/src/sna/kgem.h
index 3c4ad00..e801a15 100644
--- a/src/sna/kgem.h
+++ b/src/sna/kgem.h
@@ -64,7 +64,7 @@ struct kgem_bo {
 	uint32_t size;
 	uint32_t delta;
 
-	uint32_t pitch : 20; /* max 128k */
+	uint32_t pitch : 18; /* max 128k */
 	uint32_t tiling : 2;
 	uint32_t reusable : 1;
 	uint32_t dirty : 1;
diff --git a/src/sna/sna.h b/src/sna/sna.h
index 9d0b707..d79e9a8 100644
--- a/src/sna/sna.h
+++ b/src/sna/sna.h
@@ -641,7 +641,7 @@ sna_compute_composite_region(RegionPtr region,
 
 void
 memcpy_blt(const void *src, void *dst, int bpp,
-	   uint32_t src_stride, uint32_t dst_stride,
+	   int32_t src_stride, int32_t dst_stride,
 	   int16_t src_x, int16_t src_y,
 	   int16_t dst_x, int16_t dst_y,
 	   uint16_t width, uint16_t height);
diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
index 77c0b4c..9e49361 100644
--- a/src/sna/sna_driver.c
+++ b/src/sna/sna_driver.c
@@ -1034,7 +1034,7 @@ void sna_init_scrn(ScrnInfoPtr scrn, int entity_num)
 #endif
 
 	DBG(("%s\n", __FUNCTION__));
-	DBG(("pixman version: %d\n", pixman_version_string()));
+	DBG(("pixman version: %s\n", pixman_version_string()));
 
 	sna_device_key = xf86AllocateEntityPrivateIndex();