xf86-video-intel: src/common.h src/intel_module.c src/sna/kgem.c src/sna/sna_accel.c src/sna/sna_blt.c src/sna/sna_dri.c

[Chris Wilson]

 src/common.h        |    8 ++++----
 src/intel_module.c  |    2 +-
 src/sna/kgem.c      |    2 +-
 src/sna/sna_accel.c |   12 ++++++------
 src/sna/sna_blt.c   |    4 ++--
 src/sna/sna_dri.c   |    2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit 6553c9e1cbfcecf781ba106de99f9e70c6d373ba
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Nov 2 10:03:45 2011 +0000

    sna: Quieten a fewer compiler sign compare warnings
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/common.h b/src/common.h
index 6f23cdd..6b9c315 100644
--- a/src/common.h
+++ b/src/common.h
@@ -97,8 +97,8 @@ extern void I830DPRINTF_stub(const char *filename, int line,
 
 static inline void memset_volatile(volatile void *b, int c, size_t len)
 {
-    int i;
-    
+    size_t i;
+
     for (i = 0; i < len; i++)
 	((volatile char *)b)[i] = c;
 }
@@ -106,8 +106,8 @@ static inline void memset_volatile(volatile void *b, int c, size_t len)
 static inline void memcpy_volatile(volatile void *dst, const void *src,
 				   size_t len)
 {
-    int i;
-    
+    size_t i;
+
     for (i = 0; i < len; i++)
 	((volatile char *)dst)[i] = ((volatile char *)src)[i];
 }
diff --git a/src/intel_module.c b/src/intel_module.c
index cd9c1a3..3a0ecc9 100644
--- a/src/intel_module.c
+++ b/src/intel_module.c
@@ -299,7 +299,7 @@ static Bool intel_pci_probe(DriverPtr		driver,
 {
 	ScrnInfoPtr scrn;
 	PciChipsets intel_pci_chipsets[ARRAY_SIZE(_intel_chipsets)];
-	int i;
+	unsigned i;
 
 	chipset_info = (void *)match_data;
 
diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index 60ae5ca..7770175 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -1954,7 +1954,7 @@ struct kgem_bo *kgem_create_buffer(struct kgem *kgem,
 {
 	struct kgem_partial_bo *bo;
 	bool write = !!(flags & KGEM_BUFFER_WRITE);
-	int offset, alloc;
+	unsigned offset, alloc;
 	uint32_t handle;
 
 	DBG(("%s: size=%d, flags=%x [write=%d, last=%d]\n",
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 4fc1337..f70a312 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -1559,7 +1559,7 @@ sna_put_xypixmap_blt(DrawablePtr drawable, GCPtr gc, RegionPtr region,
 
 			b = sna->kgem.batch + sna->kgem.nbatch;
 			b[0] = XY_FULL_MONO_PATTERN_MONO_SRC_BLT;
-			if (drawable->bitsPerPixel >=3224)
+			if (drawable->bitsPerPixel == 32)
 				b[0] |= 3 << 20;
 			b[0] |= ((box->x1 - x) & 7) << 17;
 			b[1] = bo->pitch;
@@ -3170,7 +3170,7 @@ sna_poly_point_blt(DrawablePtr drawable,
 
 		sna_damage_add_points(damage, pt, n, last.x, last.y);
 		do {
-			int nbox = n;
+			unsigned nbox = n;
 			if (nbox > ARRAY_SIZE(box))
 				nbox = ARRAY_SIZE(box);
 			n -= nbox;
@@ -4114,7 +4114,7 @@ sna_poly_segment_blt(DrawablePtr drawable,
 		dy += drawable->y;
 		if (dx|dy) {
 			do {
-				int nbox = n;
+				unsigned nbox = n;
 				if (nbox > ARRAY_SIZE(boxes))
 					nbox = ARRAY_SIZE(boxes);
 				n -= nbox;
@@ -4160,7 +4160,7 @@ sna_poly_segment_blt(DrawablePtr drawable,
 			} while (n);
 		} else {
 			do {
-				int nbox = n;
+				unsigned nbox = n;
 				if (nbox > ARRAY_SIZE(boxes))
 					nbox = ARRAY_SIZE(boxes);
 				n -= nbox;
@@ -5576,7 +5576,7 @@ sna_poly_fill_rect_blt(DrawablePtr drawable,
 		sna_damage_add_rectangles(damage, rect, n, dx, dy);
 		if (dx|dy) {
 			do {
-				int nbox = n;
+				unsigned nbox = n;
 				if (nbox > ARRAY_SIZE(boxes))
 					nbox = ARRAY_SIZE(boxes);
 				n -= nbox;
@@ -5593,7 +5593,7 @@ sna_poly_fill_rect_blt(DrawablePtr drawable,
 			} while (n);
 		} else {
 			do {
-				int nbox = n;
+				unsigned nbox = n;
 				if (nbox > ARRAY_SIZE(boxes))
 					nbox = ARRAY_SIZE(boxes);
 				n -= nbox;
diff --git a/src/sna/sna_blt.c b/src/sna/sna_blt.c
index 12dd2a0..5420712 100644
--- a/src/sna/sna_blt.c
+++ b/src/sna/sna_blt.c
@@ -632,7 +632,7 @@ pixel_is_white(uint32_t pixel, uint32_t format)
 	case PICT_TYPE_ARGB:
 	case PICT_TYPE_ABGR:
 	case PICT_TYPE_BGRA:
-		return pixel == ((1 << PICT_FORMAT_BPP(format)) - 1);
+		return pixel == ((1U << PICT_FORMAT_BPP(format)) - 1);
 	default:
 		return FALSE;
 	}
@@ -1730,7 +1730,7 @@ Bool sna_blt_copy_boxes(struct sna *sna, uint8_t alu,
 			int bpp, const BoxRec *box, int nbox)
 {
 	struct kgem *kgem = &sna->kgem;
-	int src_pitch, br13, cmd;
+	unsigned src_pitch, br13, cmd;
 
 #if DEBUG_NO_BLT || NO_BLT_COPY_BOXES
 	return FALSE;
diff --git a/src/sna/sna_dri.c b/src/sna/sna_dri.c
index f724026..d21cfb1 100644
--- a/src/sna/sna_dri.c
+++ b/src/sna/sna_dri.c
@@ -96,7 +96,7 @@ struct sna_dri_frame_event {
 	XID drawable_id;
 	ClientPtr client;
 	enum frame_event_type type;
-	int frame;
+	unsigned frame;
 	int pipe;
 	int count;