From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751839AbdAaKsf (ORCPT ); Tue, 31 Jan 2017 05:48:35 -0500 Received: from mailout1.samsung.com ([203.254.224.24]:43502 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750998AbdAaKsQ (ORCPT ); Tue, 31 Jan 2017 05:48:16 -0500 X-AuditID: b6c32a39-f79c86d000001a4c-32-58905ac1ca11 Subject: Re: [PATCH 01/11] [media] s5p-mfc: Rename IS_MFCV8 macro From: Smitha T Murthy To: Andrzej Hajda Cc: linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, 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 In-reply-to: <35fef778-fa21-5f40-d399-96acd64c8511@samsung.com> Content-type: text/plain; charset=UTF-8 Date: Tue, 31 Jan 2017 14:26:34 +0530 Message-id: <1485852994.16927.6.camel@smitha-fedora> MIME-version: 1.0 X-Mailer: Evolution 2.28.3 (2.28.3-1.fc12) Content-transfer-encoding: 7bit X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprIJsWRmVeSWpSXmKPExsWy7bCmnu7BqAkRBq3flS1urTvHanFk7VUm i5kn2lktzp/fwG5xtukNu8Wmx9dYLS7vmsNm0bNhK6vF2iN32S2WbfrDZLFo6xd2i8Nv2lkd eDw2repk89i8pN6jb8sqRo/Pm+Q8rhxpZA9gjUq1yUhNTEktUkjNS85PycxLt1XyDo53jjc1 MzDUNbS0MFdSyEvMTbVVcvEJ0HXLzAE6T0mhLDGnFCgUkFhcrKRvZ1OUX1qSqpCRX1xiqxRt aGikZ2hgrmdkZKRnYhRrZWQKVJKQmnHntE3Bc5OK1x9WsTYwztPuYuTkkBAwkfg4s5UNwhaT uHBvPZDNxSEksINRYk17KyuE85lR4s26TawwHTcOvWCCSGxglLg95SgTSEJYwFFi1pp2ZhCb TUBH4tv702BjRQTUJWafvMMM0sAsMI9J4u2y9YwgCU4Be4mlbXvBmpkFNCVat/9mB7FZBFQl ZvbtBovzAm3rXH0CqJ4DyBaU+LtDGOIIbYl1DWdYIFrlJba/nQM2X0JgH7vE19ebWEDqJQRk JTYdYIaod5HYdfQi1JvCEq+Ob2GHsKUkmj9+YIXobWaUmLutmQUiMYFRYmVrKYRtL3Hgyhyo ZXwS7772sELM55XoaBOCKPGQONn4nQ0i7Cjx4psHJHw6mCRuP7vCMoFRbhaSL2chfDMLyQcL GJlXMYqlFhTnpqcWGxaY6hUn5haX5qXrJefnbmIEJ0ctyx2Mx875HGIU4GBU4uHVaOuPEGJN LCuuzD3EKMHBrCTCm+83IUKINyWxsiq1KD++qDQntfgQoykwUCcyS4km5wMTd15JvKGJmaGJ kYmBuZmFhYmSOO/iRusIIYH0xJLU7NTUgtQimD4mDk6pBsYIqS1fta9GRWj6SFrzfAlh1u0O m3H57pmdovN2Hz1bUfforQm3nct1RbaSBtcd76Z+amwO5wwVfsOgs3j5m9lzX0ue3y6qYF+7 +XOlKtuSedWpC1k/RF8yXmFSHlgz67Tl1cnrS7tnNew8rS+33/lzuCrrKeGOeTzhwt+nxB8P ackJOynDzKPEUpyRaKjFXFScCADsMcVjpAMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrLIsWRmVeSWpSXmKPExsWSnRNsqHswakKEQcNrdotb686xWhxZe5XJ YuaJdlaL8+c3sFucbXrDbrHp8TVWi8u75rBZ9GzYymqx9shddotlm/4wWSza+oXd4vCbdlYH Ho9NqzrZPDYvqffo27KK0ePzJjmPK0ca2QNYo9xsMlITU1KLFFLzkvNTMvPSbZVCQ9x0LZQU 8hJzU22VInR9Q4KUFMoSc0qBPCMDNODgHOAerKRvl+CWcee0TcFzk4rXH1axNjDO0+5i5OSQ EDCRuHHoBROELSZx4d56ti5GLg4hgXWMEmcXzGEDSQgLOErMWtPODGKzCehIfHt/GiwuIqAu MfvkHWaQBmaBmUwSf/d8AyviFLCXWNq2lwliUjeTxI0ti1hAEswCmhKt23+zg9gsAqoSM/t2 g63mBTqjc/UJxi5GDiBbUOLvDmGIi7Ql1jWcgWqVl9j+dg7zBEb+WUgmzULomIWkagEj8ypG sdSC4tz03OICA0O94sTc4tK8dL3k/NxNjMCo23ZYSWwHY9sKr0OMAhyMSjy8E6b1RwixJpYV V+YeYpTgYFYS4c33mxAhxJuSWFmVWpQfX1Sak1p8iNEU6PCJzFKiyfnAhJBXEm9oYmphYWFi aWxsbGGiJM4bO/1ZuJBAemJJanZqakFqEUwfEwenVAMjlx6jTctt1fc8uyWuz37cE3/k1XQ/ n07RWdqTJ3zneWd28mHTJQa5iYmKyqt/15/5HlNzo+/UPMW2Z+xKGYbzlTv9PjJ4BO9dLmMh v/lk9oVzstcKJLapnQ46FXbUR9+DX8/+m8tfoa7dDL0TxW05gt/39ZWcDLrgucW464FR9Yu9 /x0LZgspsRRnJBpqMRcVJwIAQ/ys/NACAAA= X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170131093705epcas1p372c2322b1ae3efd834f6fc49a4a90f34 X-Msg-Generator: CA X-Sender-IP: 182.195.34.22 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 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> <1484733729-25371-2-git-send-email-smitha.t@samsung.com> <35fef778-fa21-5f40-d399-96acd64c8511@samsung.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 2017-01-18 at 15:51 +0100, Andrzej Hajda wrote: > 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 Thanks for review and ack. Regards, Smitha > -- > 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. > > >