From patchwork Wed Sep 7 06:18:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tiffany Lin X-Patchwork-Id: 36871 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bhWCI-0000Ac-7w; Wed, 07 Sep 2016 06:18:58 +0000 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.84_2/mailfrontend-5) with esmtp id 1bhWCE-0004V0-9L; Wed, 07 Sep 2016 08:18:56 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753511AbcIGGSw (ORCPT + 1 other); Wed, 7 Sep 2016 02:18:52 -0400 Received: from mailgw02.mediatek.com ([210.61.82.184]:39966 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1751021AbcIGGSu (ORCPT ); Wed, 7 Sep 2016 02:18:50 -0400 Received: from mtkhts09.mediatek.inc [(172.21.101.70)] by mailgw02.mediatek.com (envelope-from ) (mhqrelay.mediatek.com ESMTP with TLS) with ESMTP id 864190478; Wed, 07 Sep 2016 14:18:42 +0800 Received: from localhost.localdomain (10.21.14.115) by mtkhts09.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 14.3.266.1; Wed, 7 Sep 2016 14:18:40 +0800 From: Tiffany Lin To: Hans Verkuil , Laurent Pinchart , Mauro Carvalho Chehab , Matthias Brugger , Daniel Kurtz , Pawel Osciak CC: Eddie Huang , Yingjoe Chen , , , , , Tiffany Lin Subject: [PATCH] vcodec: mediatek: Fix decoder compiler/sparse warnings Date: Wed, 7 Sep 2016 14:18:39 +0800 Message-ID: <1473229119-5706-1-git-send-email-tiffany.lin@mediatek.com> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 X-MTK: N Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2016.9.7.61218 X-PMX-Spam: Gauge=X, Probability=10%, Report=' URI_HOSTNAME_CONTAINS_EQUALS 0.4, MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, MSGID_ADDED_BY_MTA 0.05, BODY_SIZE_4000_4999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, LEGITIMATE_NEGATE 0, LEGITIMATE_SIGNS 0, MULTIPLE_REAL_RCPTS 0, NO_URI_HTTPS 0, SINGLE_URI_IN_BODY 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CC_NAME 0, __CC_NAME_DIFF_FROM_ACC 0, __CC_REAL_NAMES 0, __CP_URI_IN_BODY 0, __CT 0, __CT_TEXT_PLAIN 0, __DATE_TZ_HK 0, __HAS_CC_HDR 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MULTIPLE_RCPTS_CC_X2 0, __MULTIPLE_RCPTS_TO_X5 0, __SANE_MSGID 0, __SINGLE_URI_TEXT 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NAME 0, __TO_NAME_DIFF_FROM_ACC 0, __TO_REAL_NAMES 0, __URI_IN_BODY 0, __URI_NO_WWW 0, __URI_NS , __URI_WITH_PATH 0' This patch fix decoder compiler/sparse warnings Signed-off-by: Tiffany Lin --- .../media/platform/mtk-vcodec/vdec/vdec_h264_if.c | 7 ++++--- .../media/platform/mtk-vcodec/vdec/vdec_vp8_if.c | 1 + .../media/platform/mtk-vcodec/vdec/vdec_vp9_if.c | 4 ++-- drivers/media/platform/mtk-vcodec/vdec_vpu_if.c | 6 ++++-- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.c b/drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.c index 0353a47..57a842f 100644 --- a/drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.c +++ b/drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.c @@ -239,7 +239,7 @@ static void put_fb_to_free(struct vdec_h264_inst *inst, struct vdec_fb *fb) mtk_vcodec_debug(inst, "[FB] put fb into free_list @(%p, %llx)", fb->base_y.va, (u64)fb->base_y.dma_addr); - list->fb_list[list->write_idx].vdec_fb_va = (u64)fb; + list->fb_list[list->write_idx].vdec_fb_va = (u64)(uintptr_t)fb; list->write_idx = (list->write_idx == H264_MAX_FB_NUM - 1) ? 0 : list->write_idx + 1; list->count++; @@ -350,7 +350,7 @@ static int vdec_h264_decode(unsigned long h_vdec, struct mtk_vcodec_mem *bs, unsigned char *buf; unsigned int buf_sz; unsigned int data[2]; - uint64_t vdec_fb_va = (u64)fb; + uint64_t vdec_fb_va = (u64)(uintptr_t)fb; uint64_t y_fb_dma = fb ? (u64)fb->base_y.dma_addr : 0; uint64_t c_fb_dma = fb ? (u64)fb->base_c.dma_addr : 0; @@ -443,7 +443,8 @@ static void vdec_h264_get_fb(struct vdec_h264_inst *inst, return; } - fb = (struct vdec_fb *)list->fb_list[list->read_idx].vdec_fb_va; + fb = (struct vdec_fb *) + (uintptr_t)list->fb_list[list->read_idx].vdec_fb_va; fb->status |= (disp_list ? FB_ST_DISPLAY : FB_ST_FREE); *out_fb = fb; diff --git a/drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.c b/drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.c index d4fce3e..054d4d1 100644 --- a/drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.c +++ b/drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.c @@ -13,6 +13,7 @@ * GNU General Public License for more details. */ +#include #include "../vdec_drv_if.h" #include "../mtk_vcodec_util.h" #include "../mtk_vcodec_dec.h" diff --git a/drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c b/drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c index 60a7b00..ca3174d 100644 --- a/drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c +++ b/drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c @@ -475,7 +475,7 @@ static void vp9_swap_frm_bufs(struct vdec_vp9_inst *inst) */ if (frm_to_show->fb != NULL) mtk_vcodec_err(inst, - "inst->cur_fb->base_y.size=%lx, frm_to_show->fb.base_y.size=%lx", + "inst->cur_fb->base_y.size=%zu, frm_to_show->fb.base_y.size=%zu", inst->cur_fb->base_y.size, frm_to_show->fb->base_y.size); } @@ -791,7 +791,7 @@ static int vdec_vp9_decode(unsigned long h_vdec, struct mtk_vcodec_mem *bs, return -EINVAL; } - mtk_vcodec_debug(inst, "Input BS Size = %ld", bs->size); + mtk_vcodec_debug(inst, "Input BS Size = %zu", bs->size); while (1) { struct vdec_fb *cur_fb = NULL; diff --git a/drivers/media/platform/mtk-vcodec/vdec_vpu_if.c b/drivers/media/platform/mtk-vcodec/vdec_vpu_if.c index 0798a6b..5a24c51 100644 --- a/drivers/media/platform/mtk-vcodec/vdec_vpu_if.c +++ b/drivers/media/platform/mtk-vcodec/vdec_vpu_if.c @@ -19,7 +19,8 @@ static void handle_init_ack_msg(struct vdec_vpu_ipi_init_ack *msg) { - struct vdec_vpu_inst *vpu = (struct vdec_vpu_inst *)msg->ap_inst_addr; + struct vdec_vpu_inst *vpu = (struct vdec_vpu_inst *) + (unsigned long)msg->ap_inst_addr; mtk_vcodec_debug(vpu, "+ ap_inst_addr = 0x%llx", msg->ap_inst_addr); @@ -38,7 +39,8 @@ static void handle_init_ack_msg(struct vdec_vpu_ipi_init_ack *msg) void vpu_dec_ipi_handler(void *data, unsigned int len, void *priv) { struct vdec_vpu_ipi_ack *msg = data; - struct vdec_vpu_inst *vpu = (struct vdec_vpu_inst *)msg->ap_inst_addr; + struct vdec_vpu_inst *vpu = (struct vdec_vpu_inst *) + (unsigned long)msg->ap_inst_addr; mtk_vcodec_debug(vpu, "+ id=%X", msg->msg_id);