From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752937AbdAROyf (ORCPT ); Wed, 18 Jan 2017 09:54:35 -0500 Received: from mailout4.w1.samsung.com ([210.118.77.14]:20960 "EHLO mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752543AbdAROy0 (ORCPT ); Wed, 18 Jan 2017 09:54:26 -0500 X-AuditID: cbfec7f2-f790f6d000002555-42-587f8111b3fd Subject: Re: [PATCH 01/11] [media] s5p-mfc: Rename IS_MFCV8 macro To: Smitha T Murthy , 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, mchehab@kernel.org, pankaj.dubey@samsung.com, krzk@kernel.org, m.szyprowski@samsung.com, s.nawrocki@samsung.com From: Andrzej Hajda Message-id: <35fef778-fa21-5f40-d399-96acd64c8511@samsung.com> Date: Wed, 18 Jan 2017 15:51:59 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.5.1 MIME-version: 1.0 In-reply-to: <1484733729-25371-2-git-send-email-smitha.t@samsung.com> Content-type: text/plain; charset=windows-1252 Content-transfer-encoding: 7bit X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrNKsWRmVeSWpSXmKPExsWy7djP87qCjfURBi1rWS2OrL3KZDHzRDur xfnzG9gtzja9YbfY9Pgaq8XlXXPYLHo2bGW1WHvkLrvFsk1/mCwWbf3CbnH4DVDx3T3bGB14 PDat6mTz2Lyk3qNvyypGj8+b5DyuHGlkD2CN4rJJSc3JLEst0rdL4Mro2d3CUnDJsKJl/WKW Bsadml2MnBwSAiYS92ZvZ4WwxSQu3FvP1sXIxSEksJRR4tP9CcwQzmdGie8L3rPBdPQfb2aE SCxjlLj5fi0rhPOMUWLevv3sIFXCAo4Ss9a0g7WLCPQzSuzaeosZJMEssJNRovlEJYjNJqAp 8XfzTbCxvAJ2Ep/n/2YBsVkEVCV27n8HdpSoQITEoWO3mSFqBCV+TL4HVsMp4CrRvvIm1EwD iRlTDjNB2PISm9e8BVssIXCOXWL5xGdAt3IAObISmw4wQ7zgItG0/wk7hC0s8er4FihbRqKz 4yATRG83MAD6T7BDOFMYJf59mAHVbS1x+PhFVohtfBKTtk1nhljAK9HRJgRR4iFxsvE7G0TY UeLFNw9ICF1mlOhvXss8gVF+FpJ/ZiH5YRaSHxYwMq9iFEktLc5NTy021itOzC0uzUvXS87P 3cQITEKn/x3/tIPx6wmrQ4wCHIxKPLwdRfURQqyJZcWVuYcYJTiYlUR459cDhXhTEiurUovy 44tKc1KLDzFKc7AoifPuWXAlXEggPbEkNTs1tSC1CCbLxMEp1cB4WDnma//XMD1WjqKb6Udz Xqt1fRZsrK68fv+OgljqYubStgf9DE/bPROsuX6nvS2d7Ff0j5O7tlHS9fW7O3Efz+YuteVm rVrx41syE8vrxacFhP/enNC6fdOaCf7tzfNr9LvtXqcYlD5pyt3a+3SZgW5FtnTS348znzUe 9ZdrFXi5RrheIEGJpTgj0VCLuag4EQDZ8Lz8PgMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrJIsWRmVeSWpSXmKPExsVy+t/xy7pejfURBitaRCyOrL3KZDHzRDur xfnzG9gtzja9YbfY9Pgaq8XlXXPYLHo2bGW1WHvkLrvFsk1/mCwWbf3CbnH4DVDx3T3bGB14 PDat6mTz2Lyk3qNvyypGj8+b5DyuHGlkD2CNcrPJSE1MSS1SSM1Lzk/JzEu3VQoNcdO1UFLI S8xNtVWK0PUNCVJSKEvMKQXyjAzQgINzgHuwkr5dgltGz+4WloJLhhUt6xezNDDu1Oxi5OSQ EDCR6D/ezAhhi0lcuLeerYuRi0NIYAmjxI+2g4wQzjNGiRM/GplAqoQFHCVmrWlnBkmICPQz Shx4384OUXWZUeLXqrVg/cwCOxkl7h6YzwLSwiagKfF38002EJtXwE7i8/zfYHEWAVWJnfvf sXYxcnCICkRINBxOhygRlPgx+R5YCaeAq0T7ypvMICXMAnoS9y9qgYSZBeQlNq95yzyBUWAW ko5ZCFWzkFQtYGRexSiSWlqcm55bbKhXnJhbXJqXrpecn7uJERiN24793LyD8dLG4EOMAhyM Sjy8HUX1EUKsiWXFlbmHGCU4mJVEeOfXA4V4UxIrq1KL8uOLSnNSiw8xmgJ9MJFZSjQ5H5go 8kriDU0MzS0NjYwtLMyNjJTEeUs+XAkXEkhPLEnNTk0tSC2C6WPi4JRqYOw5qDBx0tvXIgV3 P+R4fOk8bxi5mX1G4OsOAV29y0/i7S65Mkl3KTw62tzdfH5iWkr80Wcv7zawmf+TPJzK+ZQz 5cQMtmyTCbNm/Wb9ePqhjs4p7qqIZzLJwtNt/6bMOTOn5XvkzZMJFkc3frBYcUNtKkt/4S6z yr8/ouf61reetLy1TGRS810lluKMREMt5qLiRACZpCpv3AIAAA== X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170118145200eucas1p1204c8e0cbd4b52934eb34489d6d6a6ba X-Msg-Generator: CA X-Sender-IP: 182.198.249.179 X-Local-Sender: =?UTF-8?B?QW5kcnplaiBIYWpkYRtTUlBPTC1LZXJuZWwgKFRQKRvsgrw=?= =?UTF-8?B?7ISx7KCE7J6QG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Global-Sender: =?UTF-8?B?QW5kcnplaiBIYWpkYRtTUlBPTC1LZXJuZWwgKFRQKRtTYW1z?= =?UTF-8?B?dW5nIEVsZWN0cm9uaWNzG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Sender-Code: =?UTF-8?B?QzEwG0VIURtDMTBDRDAyQ0QwMjczOTI=?= CMS-TYPE: 201P X-HopCount: 7 X-CMS-RootMailID: 20170118100718epcas5p1f9aebb16fc61d41a13d09054fa96a14d X-RootMTR: 20170118100718epcas5p1f9aebb16fc61d41a13d09054fa96a14d References: <1484733729-25371-1-git-send-email-smitha.t@samsung.com> <1484733729-25371-2-git-send-email-smitha.t@samsung.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 18.01.2017 11:01, Smitha T Murthy wrote: > 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 -- Regards Andrzej > --- > 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. From mboxrd@z Thu Jan 1 00:00:00 1970 From: a.hajda@samsung.com (Andrzej Hajda) Date: Wed, 18 Jan 2017 15:51:59 +0100 Subject: [PATCH 01/11] [media] s5p-mfc: Rename IS_MFCV8 macro In-Reply-To: <1484733729-25371-2-git-send-email-smitha.t@samsung.com> References: <1484733729-25371-1-git-send-email-smitha.t@samsung.com> <1484733729-25371-2-git-send-email-smitha.t@samsung.com> Message-ID: <35fef778-fa21-5f40-d399-96acd64c8511@samsung.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 18.01.2017 11:01, Smitha T Murthy wrote: > 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 -- Regards Andrzej > --- > 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.