sna: Fix DBG compilation

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

8 files changed, 10 insertions, 10 deletions

diff --git a/src/sna/gen5_render.c b/src/sna/gen5_render.c
index 85ef653a..557013e3 100644
--- a/src/sna/gen5_render.c
+++ b/src/sna/gen5_render.c
@@ -2263,7 +2263,7 @@ gen5_render_copy_boxes(struct sna *sna, uint8_t alu,
 {
 	struct sna_composite_op tmp;
 
-	DBG(("%s alu=%d, src=%d:handle=%d, dst=%d:handle=%d boxes=%d x [((%d, %d), (%d, %d))...], flags=%x\n",
+	DBG(("%s alu=%d, src=%ld:handle=%d, dst=%ld:handle=%d boxes=%d x [((%d, %d), (%d, %d))...], flags=%x\n",
 	     __FUNCTION__, alu,
 	     src->drawable.serialNumber, src_bo->handle,
 	     dst->drawable.serialNumber, dst_bo->handle,
diff --git a/src/sna/gen6_render.c b/src/sna/gen6_render.c
index 9b45d798..09fdb67a 100644
--- a/src/sna/gen6_render.c
+++ b/src/sna/gen6_render.c
@@ -1596,7 +1596,7 @@ gen6_render_video(struct sna *sna,
 	DBG(("%s: src=(%d, %d), dst=(%d, %d), %ldx[(%d, %d), (%d, %d)...]\n",
 	     __FUNCTION__,
 	     src_width, src_height, dst_width, dst_height,
-	     REGION_NUM_RECTS(dstRegion),
+	     (long)REGION_NUM_RECTS(dstRegion),
 	     REGION_EXTENTS(NULL, dstRegion)->x1,
 	     REGION_EXTENTS(NULL, dstRegion)->y1,
 	     REGION_EXTENTS(NULL, dstRegion)->x2,
diff --git a/src/sna/gen7_render.c b/src/sna/gen7_render.c
index 7d4d85f4..b602fe34 100644
--- a/src/sna/gen7_render.c
+++ b/src/sna/gen7_render.c
@@ -1764,7 +1764,7 @@ gen7_render_video(struct sna *sna,
 	DBG(("%s: src=(%d, %d), dst=(%d, %d), %ldx[(%d, %d), (%d, %d)...]\n",
 	     __FUNCTION__,
 	     src_width, src_height, dst_width, dst_height,
-	     REGION_NUM_RECTS(dstRegion),
+	     (long)REGION_NUM_RECTS(dstRegion),
 	     REGION_EXTENTS(NULL, dstRegion)->x1,
 	     REGION_EXTENTS(NULL, dstRegion)->y1,
 	     REGION_EXTENTS(NULL, dstRegion)->x2,
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 70d51c2c..6ac93bbf 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -1794,7 +1794,7 @@ static inline bool operate_inplace(struct sna_pixmap *priv, unsigned flags)
 
 	if (priv->create & KGEM_CAN_CREATE_LARGE) {
 		DBG(("%s: large object, has GPU? %d\n",
-		     __FUNCTION__, priv->gpu_bo));
+		     __FUNCTION__, priv->gpu_bo ? priv->gpu_bo->handle : 0));
 		return priv->gpu_bo != NULL;
 	}
 
@@ -4016,7 +4016,7 @@ try_upload_tiled_x(PixmapPtr pixmap, RegionRec *region,
 
 	DBG(("%s: bo? %d, can map? %d\n", __FUNCTION__,
 	     priv->gpu_bo != NULL,
-	     priv->gpu_bo ? kgem_bo_can_map__cpu(kgem, priv->gpu_bo, true) : 0));
+	     priv->gpu_bo ? kgem_bo_can_map__cpu(&sna->kgem, priv->gpu_bo, true) : 0));
 
 	replaces = region->data == NULL &&
 		w >= pixmap->drawable.width &&
diff --git a/src/sna/sna_damage.c b/src/sna/sna_damage.c
index cd478f4b..8bfe8f95 100644
--- a/src/sna/sna_damage.c
+++ b/src/sna/sna_damage.c
@@ -415,7 +415,7 @@ static void __sna_damage_reduce(struct sna_damage *damage)
 	assert(damage->mode != DAMAGE_ALL);
 	assert(damage->dirty);
 
-	DBG(("    reduce: before region.n=%ld\n", REGION_NUM_RECTS(region)));
+	DBG(("    reduce: before region.n=%ld\n", (long)REGION_NUM_RECTS(region)));
 
 	nboxes = damage->embedded_box.size;
 	list_for_each_entry(iter, &damage->embedded_box.list, list)
@@ -529,7 +529,7 @@ done:
 	free_list(&damage->embedded_box.list);
 	reset_embedded_box(damage);
 
-	DBG(("    reduce: after region.n=%ld\n", REGION_NUM_RECTS(region)));
+	DBG(("    reduce: after region.n=%ld\n", (long)REGION_NUM_RECTS(region)));
 }
 
 static void damage_union(struct sna_damage *damage, const BoxRec *box)
diff --git a/src/sna/sna_trapezoids.c b/src/sna/sna_trapezoids.c
index cc8375f2..feb1d40d 100644
--- a/src/sna/sna_trapezoids.c
+++ b/src/sna/sna_trapezoids.c
@@ -102,7 +102,7 @@ static void apply_damage(struct sna_composite_op *op, RegionPtr region)
 {
 	DBG(("%s: damage=%p, region=%ldx[(%d, %d), (%d, %d)]\n",
 	     __FUNCTION__, op->damage,
-	     REGION_NUM_RECTS(region),
+	     (long)REGION_NUM_RECTS(region),
 	     region->extents.x1, region->extents.y1,
 	     region->extents.x2, region->extents.y2));
 
diff --git a/src/sna/sna_video_overlay.c b/src/sna/sna_video_overlay.c
index 848c471c..9020b9b2 100644
--- a/src/sna/sna_video_overlay.c
+++ b/src/sna/sna_video_overlay.c
@@ -494,7 +494,7 @@ sna_video_overlay_put_image(ClientPtr client,
 	     format->id, width, height, sync));
 
 	DBG(("%s: region %ld:(%d, %d), (%d, %d)\n", __FUNCTION__,
-	     RegionNumRects(&clip),
+	     (long)RegionNumRects(&clip),
 	     clip.extents.x1, clip.extents.y1,
 	     clip.extents.x2, clip.extents.y2));
 
diff --git a/src/sna/sna_video_textured.c b/src/sna/sna_video_textured.c
index cd5300f7..1d199238 100644
--- a/src/sna/sna_video_textured.c
+++ b/src/sna/sna_video_textured.c
@@ -193,7 +193,7 @@ sna_video_textured_put_image(ClientPtr client,
 	     format->id, width, height, sync));
 
 	DBG(("%s: region %ld:(%d, %d), (%d, %d)\n", __FUNCTION__,
-	     RegionNumRects(&clip),
+	     (long)RegionNumRects(&clip),
 	     clip.extents.x1, clip.extents.y1,
 	     clip.extents.x2, clip.extents.y2));