From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752499AbdARKKk (ORCPT ); Wed, 18 Jan 2017 05:10:40 -0500 Received: from mailout3.samsung.com ([203.254.224.33]:37505 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752133AbdARKKa (ORCPT ); Wed, 18 Jan 2017 05:10:30 -0500 X-AuditID: b6c32a58-f79946d000005960-ff-587f3e58832e From: Smitha T Murthy To: linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Cc: kyungmin.park@samsung.com, kamil@wypas.org, jtp.park@samsung.com, a.hajda@samsung.com, mchehab@kernel.org, pankaj.dubey@samsung.com, krzk@kernel.org, m.szyprowski@samsung.com, s.nawrocki@samsung.com, Smitha T Murthy Subject: [PATCH 01/11] [media] s5p-mfc: Rename IS_MFCV8 macro Date: Wed, 18 Jan 2017 15:31:59 +0530 Message-id: <1484733729-25371-2-git-send-email-smitha.t@samsung.com> X-Mailer: git-send-email 1.7.2.3 In-reply-to: <1484733729-25371-1-git-send-email-smitha.t@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAAzWSbUhTYRTHe3Z3t6ktbrPyQS3GjYgkl/c69VrOtEwGJUj1YSlit/mgktvk 3s2XinzLl2yafogULMTUcGHFUkkp8bUSyxdSsZWVFRHDlMhmUFab176d539+55z/eTgyTPEK 95dlGs2IM7JZpMRb3DW4Z0+wLrpAF2LrJRjH3TGcGWqfFjH1z8pxZnz8vpR5UbwgZewfZ3Dm ZU+DhLHe78SZ9qE5KdNq/y1imjqXpczgghuee9QFYuRau+2yRPuguUBb3WED2u/2HdqpoSJp Ip6EojIQm4Y4JTLqTWmZxnQNefRE6uHUsPAQKpiKZCJIpZE1IA0ZdywxOD4zy+2RVOawWRa3 lMjyPLkvOoozWcxImWHizRoymaJoFRUSoaJpWqWmU/bTYW7kNMp482QQy3ao8ooWNxeC17sr gUwGCTUcfZxWCbzc4TY48faepBJ4yxREC4DLndNS4VEugtMjNqlAqWH5yLv1xG0AW5pr10v+ Aljd/QH3UBJiL3QtjUo88RYCQefddtwDYcRPAB2uWbEn4Uto4Mr7YonHh5jYBa3zmEeWE3Hw ee8KEKYpoXO2fW2yF3EE1r59Ixb0m1L42XpcWGE7tPdhQhgHv3afFAhf6Hzase45AK62OIDH ASRKALzRVbLepgbAtlKLEB+EfVMNazpGbIJVvz6JhJ5yWFGmEBAtHClakQhyLPzi0gqb1wG4 VH8NrwGBjWCDDWxD2bwhHfFh2WoVzxp4izFdpTcZ7GDtrIJ0D8GfuuMDgJABcqN8A7qoU+Bs Dp9vGABQhpFb5AtMgU4hT2PzzyHOlMpZshA/AMLcf1SL+W/Vm9xHajSnUupwSk1H0uGRVChN +skb8w7oFEQ6a0ZnEcpG3P86kczLvxBcv1KuTzmF4ZYTCZqFWz6XXAETfy0On/Mh3ROJq3QK 4wgc4yZqChx+sT6hq6WF+gosYhEmM6Uv+ncGYGUjfl1+jWMrrdbS+at3huOrOr4lTaq/OhMO xQyMc78CLwzPTM7Hb2794T1amCuqmrO6PrxPyMyJ6Jnq55qKz/C5k22kmM9gqSCM49l/0VyJ RmwDAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupkkeLIzCtJLcpLzFFi42I5/e+xgG6YXX2EwdP5pha31p1jtTiy9iqT xcwT7awW589vYLc42/SG3WLT42usFpd3zWGz6NmwldVi7ZG77BbLNv1hsli09Qu7xeE3QMV3 92xjdOD12LSqk81j85J6j74tqxg9Pm+S87hypJE9gDXKzSYjNTEltUghNS85PyUzL91WKTTE TddCSSEvMTfVVilC1zckSEmhLDGnFMgzMkADDs4B7sFK+nYJbhl3jh1mLrilV9H4TrCB8bZ6 FyMnh4SAiUT7yfvsELaYxIV769m6GLk4hASWMkqcXNHACuE0MkkcOr0NrIpNQEfi2/vTbCC2 iECqxNqt58GKmAV+MEo0HXgJViQsYCvx/UETUBEHB4uAqkTPQ2aQMK+Ai8SZfd8ZIbYpSLy6 sRasnFPAVWLivTssILYQUM2so5MZJzDyLmBkWMUokVqQXFCclJ5rlJdarlecmFtcmpeul5yf u4kRHA3PpHcwHt7lfohRgINRiYc3QLQuQog1say4MvcQowQHs5II73zb+ggh3pTEyqrUovz4 otKc1OJDjKZAd01klhJNzgdGal5JvKGJuYm5sYGFuaWliZGSOG/j7GfhQgLpiSWp2ampBalF MH1MHJxSDYy6z7du+z2j9c7UhHNtjevSOXdZH9y9uezu5KuSHQkcc79Vvq1Lu79BxcPkm821 tt264oXFk4355+vvu7/YS3x7v1Ef01qtJ+IR7JrvL5xp/fllacO1VyoZhcv+rYwLSz7TevLl HofgimN/l+VsTv2rdnJ/qfGul8sVZJ8u29rFsVhKa1Xf+8mKSizFGYmGWsxFxYkAf6L1gpwC AAA= X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170118100718epcas5p1f9aebb16fc61d41a13d09054fa96a14d X-Msg-Generator: CA X-Sender-IP: 203.254.230.27 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: 105P DLP-Filter: Pass X-CFilter-Loop: Reflected X-HopCount: 7 X-CMS-RootMailID: 20170118100718epcas5p1f9aebb16fc61d41a13d09054fa96a14d X-RootMTR: 20170118100718epcas5p1f9aebb16fc61d41a13d09054fa96a14d References: <1484733729-25371-1-git-send-email-smitha.t@samsung.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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 ab23236..b45d18c 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h @@ -722,7 +722,7 @@ struct mfc_control { #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 cc88871..484af6b 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c @@ -427,7 +427,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 367ef8e..0ec2928 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 57da798..0572521 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, @@ -366,7 +366,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; @@ -454,7 +454,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, @@ -2120,7 +2120,7 @@ static unsigned int s5p_mfc_get_crop_info_v_v6(struct s5p_mfc_ctx *ctx) 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. -- 1.7.2.3