From patchwork Thu Apr 6 06:11:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Smitha T Murthy X-Patchwork-Id: 9666087 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 89E8D6021C for ; Thu, 6 Apr 2017 06:10:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 755C628573 for ; Thu, 6 Apr 2017 06:10:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 69CAE28581; Thu, 6 Apr 2017 06:10:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D511D28573 for ; Thu, 6 Apr 2017 06:10:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-reply-to:Message-id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=xeMTGkveOdMe8g032z77qyhuGrDTsa44S9LIt3lTEKU=; b=eh5wBUL2gA3Yqfx1eX4kXVaOBs FHXIWh96gr6hzlczAMe1mpO49pDHrdJtKPvYOet7sJx1IrjfcGcsRswSZ4qm1BHTaJWk9S15xrJhp JFiCqy8GcB+tMWeipHvZ8PKnLjM2ujD6hJhW8pj95vDLpdcmBh49O9z/+HSAa3Zmzf6MwttLx7Tqf IivSlAKk22l7CaS6kUigYo/3E63B9Ey/kaSIGJ/4/0NG1Pw6YYV7pEcGWRDwqgzCnbVtInlAylijB QICriI30TdKG56Y/Qka+cStYlJJltmFS+nTd1xuRgdNxIGCB2ruhUbIfvF6MRZM6huEzMPlKtInTM WQW5rodg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cw0cu-000493-QQ; Thu, 06 Apr 2017 06:10:36 +0000 Received: from mailout1.samsung.com ([203.254.224.24] helo=epoutp01.samsung.com) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cw0cg-0002g7-L5 for linux-arm-kernel@lists.infradead.org; Thu, 06 Apr 2017 06:10:24 +0000 Received: from epcas1p4.samsung.com (unknown [182.195.41.48]) by epoutp01.samsung.com (KnoxPortal) with ESMTP id 20170406061000epoutp01ec8f2896678f8873e57e06dadd9619cb~yug8HI72a1678716787epoutp01W; Thu, 6 Apr 2017 06:10:00 +0000 (GMT) Received: from epsmges1p4.samsung.com (unknown [182.195.42.56]) by epcas1p1.samsung.com (KnoxPortal) with ESMTP id 20170406060959epcas1p1133be4b87b2c578ab9149ea1c6a5b12e~yug7s2pNJ0128801288epcas1p1T; Thu, 6 Apr 2017 06:09:59 +0000 (GMT) Received: from epcas1p4.samsung.com ( [182.195.41.48]) by epsmges1p4.samsung.com (Symantec Messaging Gateway) with SMTP id 9B.DC.12779.7BBD5E85; Thu, 6 Apr 2017 15:09:59 +0900 (KST) Received: from epcpsbgm1new.samsung.com (u26.gpu120.samsung.co.kr [203.254.230.26]) by epcas1p3.samsung.com (KnoxPortal) with ESMTP id 20170406060959epcas1p3dbc6a99eca8f84dfc16da8e288615faa~yug7VeVbF0350903509epcas1p3C; Thu, 6 Apr 2017 06:09:59 +0000 (GMT) X-AuditID: b6c32a38-f791a6d0000031eb-11-58e5dbb7dfdc Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1new.samsung.com (EPCPMTA) with SMTP id 61.79.05715.7BBD5E85; Thu, 6 Apr 2017 15:09:59 +0900 (KST) Received: from smitha-fedora.sisodomain.com ([107.108.83.49]) by mmp1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0ONZ009CX54EJD00@mmp1.samsung.com>; Thu, 06 Apr 2017 15:09:59 +0900 (KST) From: Smitha T Murthy To: linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [Patch v4 01/12] [media] s5p-mfc: Rename IS_MFCV8 macro Date: Thu, 06 Apr 2017 11:41:34 +0530 Message-id: <1491459105-16641-2-git-send-email-smitha.t@samsung.com> X-Mailer: git-send-email 1.7.2.3 In-reply-to: <1491459105-16641-1-git-send-email-smitha.t@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrJIsWRmVeSWpSXmKPExsWy7bCmge72208jDE7+MLK4te4cq8WRtVeZ LGaeaGe1OH9+A7vF2aY37BabHl9jtbi8aw6bRc+GrawWa4/cZbdYtukPk8WirV/YLQ6/ASq+ u2cbowOvx6ZVnWwem5fUe/RtWcXo8XmTnMeVI43sAaxRXDYpqTmZZalF+nYJXBk7Tv5mL9ih X7Hs7VTGBsYdGl2MnBwSAiYSJ481s0DYYhIX7q1n62Lk4hAS2MEocfx8CyuE084kMXPzMTaY jkMPF7NAJJYzSnRf+80M4fxnlNi9+TcjSBWbgI7Et/enwTpEBFIlXq1bCzaKWeAHo8StbzfA FgoLOEhMvnsUrIFFQFWit/k+K4jNK+AicaZlPjPEOgWJVzfWsoPYnAKuEit3HwMbJCEwj13i 4LxvQA4HkCMrsekAVL2LxNUfS6FsYYlXx7ewQ9jSEqv+3WKC6G1mlJi7DebrCYwSK1tLIWx7 iQNX5oDFmQX4JN597YGazyvR0SYEUeIh8W7SQ2aIsKPE6WdcEM/PYJSY19zJPIFRZgEjwypG sdSC4tz01GLDAhO94sTc4tK8dL3k/NxNjOAEoGWxg3HPOZ9DjAIcjEo8vB6Pn0QIsSaWFVfm HmKU4GBWEuFNn/00Qog3JbGyKrUoP76oNCe1+BCjNAeLkjiv6PprEUIC6YklqdmpqQWpRTBZ Jg5OqQbGGWxcZXl6DkmzRWdNZGow5GV9+4xlX3vav+w5RUUbgnnFJ0/ZnXOkdQZPzWKWNX38 u55GHczMXdtmptbxt2WNdaSj5uubv2fti5hlYqod9NpllknMj6We+6cznTY8y2e5XmL9x7sH baeWSol/2FLdxjs9tXFPVdNDrrey5y1c5qy+tjNU+ZGkEktxRqKhFnNRcSIAn/1NDvwCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupikeLIzCtJLcpLzFFi42I5/e+xgO72208jDO5vl7a4te4cq8WRtVeZ LGaeaGe1OH9+A7vF2aY37BabHl9jtbi8aw6bRc+GrawWa4/cZbdYtukPk8WirV/YLQ6/ASq+ u2cbowOvx6ZVnWwem5fUe/RtWcXo8XmTnMeVI43sAaxRbjYZqYkpqUUKqXnJ+SmZeem2SqEh broWSgp5ibmptkoRur4hQUoKZYk5pUCekQEacHAOcA9W0rdLcMvYcfI3e8EO/Yplb6cyNjDu 0Ohi5OSQEDCROPRwMQuELSZx4d56NhBbSGApo8S11qouRi4gu5FJ4uex1ewgCTYBHYlv70+D FYkIpEqs3XqeFaSIWeAHo0TTgZdgRcICDhKT7x5lBLFZBFQlepvvs4LYvAIuEmda5jNDbFOQ eHVjLVg9p4CrxMrdx1ghNrtI3Di/hGkCI+8CRoZVjBKpBckFxUnpuYZ5qeV6xYm5xaV56XrJ +bmbGMHx8ExqB+PBXe6HGAU4GJV4eD0eP4kQYk0sK67MPcQowcGsJMKbPvtphBBvSmJlVWpR fnxRaU5q8SFGU6DDJjJLiSbnA2M1ryTe0MTcxNzYwMLc0tLESEmct3H2s3AhgfTEktTs1NSC 1CKYPiYOTqkGRkaXfJYnTw2sWusOl4XualpkYul4sye7nOtLydJ7W9h5+LfmZTxKb7Q78PFO /Y+zivIyTU8+P9NhYnBYsOn/I50n4p9TJy2dxLWqijmkXd2X1frW1hW/C8O/Jj5fv3/LNP1s t+zSL5fENy+7sNb7gEnfQif/RXu8tG03JFyw1vswqWeWu3O+phJLcUaioRZzUXEiAH6iS2Cd AgAA X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170406060959epcas1p3dbc6a99eca8f84dfc16da8e288615faa X-Msg-Generator: CA X-Sender-IP: 203.254.230.26 X-Local-Sender: =?UTF-8?B?U21pdGhhIFQgTXVydGh5G1NTSVItVHVybiBLZXkgU29sdXRp?= =?UTF-8?B?b25zG+yCvOyEseyghOyekBtMZWFkIEVuZ2luZWVy?= X-Global-Sender: =?UTF-8?B?U21pdGhhIFQgTXVydGh5G1NTSVItVHVybiBLZXkgU29sdXRp?= =?UTF-8?B?b25zG1NhbXN1bmcgRWxlY3Ryb25pY3MbTGVhZCBFbmdpbmVlcg==?= X-Sender-Code: =?UTF-8?B?QzEwG1NXQUhRG0MxMElEMDdJRDAxMDk5Nw==?= CMS-TYPE: 101P X-CMS-RootMailID: 20170406060959epcas1p3dbc6a99eca8f84dfc16da8e288615faa X-RootMTR: 20170406060959epcas1p3dbc6a99eca8f84dfc16da8e288615faa References: <1491459105-16641-1-git-send-email-smitha.t@samsung.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170405_231023_014266_E384FF54 X-CRM114-Status: GOOD ( 12.14 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: a.hajda@samsung.com, pankaj.dubey@samsung.com, kamil@wypas.org, krzk@kernel.org, jtp.park@samsung.com, kyungmin.park@samsung.com, s.nawrocki@samsung.com, Smitha T Murthy , mchehab@kernel.org, m.szyprowski@samsung.com MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This patch renames macro IS_MFCV8 to IS_MFCV8_PLUS so that the MFCv8 code can be resued for MFCv10.10 support. Since the MFCv8 specific code holds good for MFC v10.10 also. Signed-off-by: Smitha T Murthy Acked-by: Andrzej Hajda --- drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 2 +- drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c | 2 +- drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 2 +- drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 18 +++++++++--------- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h index 4220914..5fb2684 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h @@ -711,7 +711,7 @@ void s5p_mfc_cleanup_queue(struct list_head *lh, struct vb2_queue *vq); #define IS_TWOPORT(dev) (dev->variant->port_num == 2 ? 1 : 0) #define IS_MFCV6_PLUS(dev) (dev->variant->version >= 0x60 ? 1 : 0) #define IS_MFCV7_PLUS(dev) (dev->variant->version >= 0x70 ? 1 : 0) -#define IS_MFCV8(dev) (dev->variant->version >= 0x80 ? 1 : 0) +#define IS_MFCV8_PLUS(dev) (dev->variant->version >= 0x80 ? 1 : 0) #define MFC_V5_BIT BIT(0) #define MFC_V6_BIT BIT(1) diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c b/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c index 69ef9c2..3769d22 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c @@ -399,7 +399,7 @@ int s5p_mfc_wakeup(struct s5p_mfc_dev *dev) s5p_mfc_clear_cmds(dev); s5p_mfc_clean_dev_int_flags(dev); /* 3. Send MFC wakeup command and wait for completion*/ - if (IS_MFCV8(dev)) + if (IS_MFCV8_PLUS(dev)) ret = s5p_mfc_v8_wait_wakeup(dev); else ret = s5p_mfc_wait_wakeup(dev); diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c index 8937b0a..42e9351 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c @@ -1177,7 +1177,7 @@ void s5p_mfc_dec_init(struct s5p_mfc_ctx *ctx) struct v4l2_format f; f.fmt.pix_mp.pixelformat = V4L2_PIX_FMT_H264; ctx->src_fmt = find_format(&f, MFC_FMT_DEC); - if (IS_MFCV8(ctx->dev)) + if (IS_MFCV8_PLUS(ctx->dev)) f.fmt.pix_mp.pixelformat = V4L2_PIX_FMT_NV12M; else if (IS_MFCV6_PLUS(ctx->dev)) f.fmt.pix_mp.pixelformat = V4L2_PIX_FMT_NV12MT_16X16; diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c index 85880e9..d52f23c 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c @@ -74,7 +74,7 @@ static int s5p_mfc_alloc_codec_buffers_v6(struct s5p_mfc_ctx *ctx) ctx->luma_size, ctx->chroma_size, ctx->mv_size); mfc_debug(2, "Totals bufs: %d\n", ctx->total_dpb_count); } else if (ctx->type == MFCINST_ENCODER) { - if (IS_MFCV8(dev)) + if (IS_MFCV8_PLUS(dev)) ctx->tmv_buffer_size = S5P_FIMV_NUM_TMV_BUFFERS_V6 * ALIGN(S5P_FIMV_TMV_BUFFER_SIZE_V8(mb_width, mb_height), S5P_FIMV_TMV_BUFFER_ALIGN_V6); @@ -89,7 +89,7 @@ static int s5p_mfc_alloc_codec_buffers_v6(struct s5p_mfc_ctx *ctx) ctx->chroma_dpb_size = ALIGN((mb_width * mb_height) * S5P_FIMV_CHROMA_MB_TO_PIXEL_V6, S5P_FIMV_CHROMA_DPB_BUFFER_ALIGN_V6); - if (IS_MFCV8(dev)) + if (IS_MFCV8_PLUS(dev)) ctx->me_buffer_size = ALIGN(S5P_FIMV_ME_BUFFER_SIZE_V8( ctx->img_width, ctx->img_height, mb_width, mb_height), @@ -110,7 +110,7 @@ static int s5p_mfc_alloc_codec_buffers_v6(struct s5p_mfc_ctx *ctx) switch (ctx->codec_mode) { case S5P_MFC_CODEC_H264_DEC: case S5P_MFC_CODEC_H264_MVC_DEC: - if (IS_MFCV8(dev)) + if (IS_MFCV8_PLUS(dev)) ctx->scratch_buf_size = S5P_FIMV_SCRATCH_BUF_SIZE_H264_DEC_V8( mb_width, @@ -167,7 +167,7 @@ static int s5p_mfc_alloc_codec_buffers_v6(struct s5p_mfc_ctx *ctx) ctx->bank1.size = ctx->scratch_buf_size; break; case S5P_MFC_CODEC_VP8_DEC: - if (IS_MFCV8(dev)) + if (IS_MFCV8_PLUS(dev)) ctx->scratch_buf_size = S5P_FIMV_SCRATCH_BUF_SIZE_VP8_DEC_V8( mb_width, @@ -182,7 +182,7 @@ static int s5p_mfc_alloc_codec_buffers_v6(struct s5p_mfc_ctx *ctx) ctx->bank1.size = ctx->scratch_buf_size; break; case S5P_MFC_CODEC_H264_ENC: - if (IS_MFCV8(dev)) + if (IS_MFCV8_PLUS(dev)) ctx->scratch_buf_size = S5P_FIMV_SCRATCH_BUF_SIZE_H264_ENC_V8( mb_width, @@ -215,7 +215,7 @@ static int s5p_mfc_alloc_codec_buffers_v6(struct s5p_mfc_ctx *ctx) ctx->bank2.size = 0; break; case S5P_MFC_CODEC_VP8_ENC: - if (IS_MFCV8(dev)) + if (IS_MFCV8_PLUS(dev)) ctx->scratch_buf_size = S5P_FIMV_SCRATCH_BUF_SIZE_VP8_ENC_V8( mb_width, @@ -364,7 +364,7 @@ static void s5p_mfc_dec_calc_dpb_size_v6(struct s5p_mfc_ctx *ctx) ctx->luma_size = calc_plane(ctx->img_width, ctx->img_height); ctx->chroma_size = calc_plane(ctx->img_width, (ctx->img_height >> 1)); - if (IS_MFCV8(ctx->dev)) { + if (IS_MFCV8_PLUS(ctx->dev)) { /* MFCv8 needs additional 64 bytes for luma,chroma dpb*/ ctx->luma_size += S5P_FIMV_D_ALIGN_PLANE_SIZE_V8; ctx->chroma_size += S5P_FIMV_D_ALIGN_PLANE_SIZE_V8; @@ -445,7 +445,7 @@ static int s5p_mfc_set_dec_frame_buffer_v6(struct s5p_mfc_ctx *ctx) writel(buf_addr1, mfc_regs->d_scratch_buffer_addr); writel(ctx->scratch_buf_size, mfc_regs->d_scratch_buffer_size); - if (IS_MFCV8(dev)) { + if (IS_MFCV8_PLUS(dev)) { writel(ctx->img_width, mfc_regs->d_first_plane_dpb_stride_size); writel(ctx->img_width, @@ -2109,7 +2109,7 @@ const struct s5p_mfc_regs *s5p_mfc_init_regs_v6_plus(struct s5p_mfc_dev *dev) S5P_FIMV_E_ENCODED_SOURCE_SECOND_ADDR_V7); R(e_vp8_options, S5P_FIMV_E_VP8_OPTIONS_V7); - if (!IS_MFCV8(dev)) + if (!IS_MFCV8_PLUS(dev)) goto done; /* Initialize registers used in MFC v8 only.