ayufan: rockchip-vpu: fix compilation errors

Change-Id: Ie66b5983907af4a671df3d14bfae90fcb0a60991
ayufan-rock64 · Mar 19, 2019 · 19a75e9 · 19a75e9
1 parent 742b806
commit 19a75e9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/drivers/media/platform/rockchip-vpu/rk3288_vpu_hw_h264e.c b/drivers/media/platform/rockchip-vpu/rk3288_vpu_hw_h264e.c
@@ -1352,7 +1352,7 @@ void rk3288_vpu_h264e_done(struct rockchip_vpu_ctx *ctx,
 			ctx->run.h264e.sps.byte_cnt;
 		ctx->run.dst->h264e.pps_size =
 			ctx->run.h264e.pps.byte_cnt;
-		vpu_debug(1, "sps %d, pps %d\n",
+		vpu_debug(1, "sps %zu, pps %zu\n",
 				ctx->run.dst->h264e.sps_size,
 				ctx->run.dst->h264e.pps_size);
 	} else {

diff --git a/drivers/media/platform/rockchip-vpu/rockchip_vpu_common.h b/drivers/media/platform/rockchip-vpu/rockchip_vpu_common.h
@@ -22,7 +22,7 @@
 #define ROCKCHIP_VPU_COMMON_H_
 
 /* Enable debugging by default for now. */
-#define DEBUG
+// #define DEBUG
 
 #include <linux/platform_device.h>
 #include <linux/videodev2.h>

diff --git a/drivers/media/platform/rockchip-vpu/rockchip_vpu_hw.c b/drivers/media/platform/rockchip-vpu/rockchip_vpu_hw.c
@@ -410,7 +410,7 @@ void rockchip_vpu_vp8e_assemble_bitstream(struct rockchip_vpu_ctx *ctx,
 	if (WARN_ON(dst_buf->vp8e.dct_offset + dct_size > dst_size))
 		return;
 
-	vpu_debug(1, "%s: hdr_size = %d, ext_hdr_size = %d, dct_size = %d\n",
+	vpu_debug(1, "%s: hdr_size = %zu, ext_hdr_size = %zu, dct_size = %zu\n",
 			__func__, hdr_size, ext_hdr_size, dct_size);
 
 	memmove(dst + hdr_size + ext_hdr_size,
@@ -452,7 +452,7 @@ void rockchip_vpu_h264e_assemble_bitstream(struct rockchip_vpu_ctx *ctx,
 	if (WARN_ON(sps_size + pps_size + slices_size > dst_size))
 		return;
 
-	vpu_debug(1, "%s: sps_size = %u, pps_size = %u, slices_size = %u\n",
+	vpu_debug(1, "%s: sps_size = %zu, pps_size = %zu, slices_size = %zu\n",
 		__func__, sps_size, pps_size, slices_size);
 
 	memcpy(dst, sps->buffer, sps_size);