From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751207AbdCNLgd (ORCPT ); Tue, 14 Mar 2017 07:36:33 -0400 Received: from mailout4.samsung.com ([203.254.224.34]:42153 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750848AbdCNLga (ORCPT ); Tue, 14 Mar 2017 07:36:30 -0400 X-AuditID: b6c32a58-f79f16d00000132c-60-58c7d5b76928 Subject: Re: [Patch v2 04/11] s5p-mfc: Support MFCv10.10 buffer requirements 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: Date: Tue, 14 Mar 2017 17:08:24 +0530 Message-id: <1489491504.27807.137.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+NgFtrCKsWRmVeSWpSXmKPExsWy7bCmlu72q8cjDJac4LO4te4cq8WRtVeZ LGaeaGe1OH9+A7vF2aY37BabHl9jtbi8aw6bRc+GrawWa4/cZbdYtukPk8WirV/YLQ6/aWd1 4PHYtKqTzWPzknqPvi2rGD0+b5LzuHKkkT2ANYrLJiU1J7MstUjfLoEr4+LD08wFvb4Vl+e9 YW1g3GHTxcjJISFgIrF64TtWCFtM4sK99WxdjFwcQgJLGSUeH1/KDOF8YpQ43fscrArMmfKV Dab7047drBBFOxkljhx5AdXxllHi0vQJ7CBVwgI+Eo933WECsdkEdCS+vT8N1i0ioC4x++Qd sAZmgXlMEm+XrWcESXAK2Eu8evUDbB2LgKrEzW+HmEFsXgEzie6dk4GaOYBsQYm/O4QhrtCW WNdwhgXEZhaQl9j+dg7YTAmB32wSW+cuYYcocpGYen0NlC0s8er4FihbSuJlfxs7REMzo8Tc bc0sEIkJjBIrW0shbHuJA1fmsIAsZhbQlFi/Sx8ibCvR0j2RCSQsIcAnceOtIMQNfBK9v58w QZQoSSw6c4IdooRXoqNNCCLsIXHq4TTmCYxKsxCemYXkgVkIqxYwMq9iFEstKM5NTy02LTDR K07MLS7NS9dLzs/dxAhOS1oROxj/zQg6xCjAwajEw9vx7liEEGtiWXFl7iFGCQ5mJRFeWWBS E+JNSaysSi3Kjy8qzUktPsQozcGiJM4bZTAxQkggPbEkNTs1tSC1CCbLxMEp1cC49uH8S3Fx Ts6Zs5qZJy/vDlI1rd6d6LhOzSFs/tT+tpT44rMdq5blxjl3iv5x1Ohew/s74/9Vl2vdzR9d a8IiYkoWu59Xca7OebfwzjIGoYzNJ3+nbfXxyYjhT3+5tvf0yaN8p1xDn+gHsijVLfq5/2P4 3NIzWyJZE6RclwvsCr/a4NUyhV2JpTgj0VCLuag4EQByRHVgRwMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupmkeLIzCtJLcpLzFFi42LZdlhJTrfs6vEIgxtPFC1urTvHanFk7VUm i5kn2lktzp/fwG5xtukNu8Wmx9dYLS7vmsNm0bNhK6vF2iN32S2WbfrDZLFo6xd2i8Nv2lkd eDw2repk89i8pN6jb8sqRo/Pm+Q8rhxpZA9gjeKySUnNySxLLdK3S+DKuPjwNHNBr2/F5Xlv WBsYd9h0MXJySAiYSHzasZsVwhaTuHBvPVsXIxeHkMB2RolbU35AJVQkJj+5zwZhC0us/Pec HcQWEnjNKNGwwgfEFhbwkXi86w4TiM0moCPx7f1psHoRAXWJ2SfvMIMMZRaYySTxd883ZpAE p4C9xKtXIAtAtnUzScxf/gwswSygKdG6/TfYBhYBVYmb3w6BxXkFzCS6d04GmsoBZAtK/N0h DHGQtsS6hjMsEK3yEtvfzmGewCg0C8mkWQgds5BULWBkXsUomlpQnJueW1xgpFecmFtcmpeu l5yfu4kRHEVaSTsYN80IP8QowMGoxMNboHI8Qog1say4MvcQowQHs5II7/4rQCHelMTKqtSi /Pii0pzU4kOM0hwsSuK826s3RAgJpCeWpGanphakFsFkmTg4pRoY5/zdb9XEIn4ob87VSPXo Je6vnZoOqugslN3xSXC37fT95dMma1xMOL4r/psb6/oqZQXTfoHenyXVie9OdVZrHFnTtsza 1a11xtLY4lCN6U/fOHjUFIqUlU5vnSCcp+Ly6kXxf59zi68Ju6iL3pvRVS7uIFTXcu72SX6z mPKkpYukRduSP1YpsRRnJBpqMRcVJwIALiyaG54CAAA= X-CMS-MailID: 20170314113622epcas5p29517617e57772f68f38dcb20a2a53be3 X-Msg-Generator: CA X-Sender-IP: 182.195.40.13 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==?= Content-type: text/plain; charset=utf-8 X-MTR: 20170314113622epcas5p29517617e57772f68f38dcb20a2a53be3 X-EPHeader: CA CMS-TYPE: 105P X-Auth-Email: smitha.t@samsung.com X-HopCount: 7 X-CMS-RootMailID: 20170303090444epcas5p338f4cd2b1746da117f69907ca09e0ea9 X-RootMTR: 20170303090444epcas5p338f4cd2b1746da117f69907ca09e0ea9 References: <1488532036-13044-1-git-send-email-smitha.t@samsung.com> <1488532036-13044-5-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 Mon, 2017-03-06 at 15:48 +0100, Andrzej Hajda wrote: > On 03.03.2017 10:07, Smitha T Murthy wrote: > > Aligning the luma_dpb_size, chroma_dpb_size, mv_size and me_buffer_size > > for MFCv10.10. > > > > Signed-off-by: Smitha T Murthy > > --- > > drivers/media/platform/s5p-mfc/regs-mfc-v10.h | 19 +++++ > > drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 99 ++++++++++++++++++----- > > drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h | 2 + > > 3 files changed, 99 insertions(+), 21 deletions(-) > > > > diff --git a/drivers/media/platform/s5p-mfc/regs-mfc-v10.h b/drivers/media/platform/s5p-mfc/regs-mfc-v10.h > > index bd671a5..dafcf9d 100644 > > --- a/drivers/media/platform/s5p-mfc/regs-mfc-v10.h > > +++ b/drivers/media/platform/s5p-mfc/regs-mfc-v10.h > > @@ -32,5 +32,24 @@ > > #define MFC_VERSION_V10 0xA0 > > #define MFC_NUM_PORTS_V10 1 > > > > +/* MFCv10 codec defines*/ > > +#define S5P_FIMV_CODEC_HEVC_ENC 26 > > + > > +/* Encoder buffer size for MFC v10.0 */ > > +#define ENC_V100_BASE_SIZE(x, y) \ > > + (((x + 3) * (y + 3) * 8) \ > > + + ((y * 64) + 1280) * DIV_ROUND_UP(x, 8)) > > + > > +#define ENC_V100_H264_ME_SIZE(x, y) \ > > + (ENC_V100_BASE_SIZE(x, y) \ > > + + (DIV_ROUND_UP(x * y, 64) * 32)) > > + > > +#define ENC_V100_MPEG4_ME_SIZE(x, y) \ > > + (ENC_V100_BASE_SIZE(x, y) \ > > + + (DIV_ROUND_UP(x * y, 128) * 16)) > > + > > +#define ENC_V100_VP8_ME_SIZE(x, y) \ > > + ENC_V100_BASE_SIZE(x, y) > > + > > #endif /*_REGS_MFC_V10_H*/ > > > > 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 5f0da0b..d4c75eb 100644 > > --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c > > +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c > > @@ -45,6 +45,8 @@ > > > > #define IS_MFCV6_V2(dev) (!IS_MFCV7_PLUS(dev) && dev->fw_ver == MFC_FW_V2) > > > > +#define calc_param(value, align) (DIV_ROUND_UP(value, align) * align) > > I think it is functionally the same as ALIGN, please drop it and use > ALIGN instead. > Ok I will use ALIGN. > > + > > /* Allocate temporary buffers for decoding */ > > static int s5p_mfc_alloc_dec_temp_buffers_v6(struct s5p_mfc_ctx *ctx) > > { > > @@ -64,6 +66,7 @@ static int s5p_mfc_alloc_codec_buffers_v6(struct s5p_mfc_ctx *ctx) > > { > > struct s5p_mfc_dev *dev = ctx->dev; > > unsigned int mb_width, mb_height; > > + unsigned int lcu_width = 0, lcu_height = 0; > > int ret; > > > > mb_width = MB_WIDTH(ctx->img_width); > > @@ -74,7 +77,9 @@ 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_PLUS(dev)) > > + if (IS_MFCV10(dev)) { > > + ctx->tmv_buffer_size = 0; > > + } else 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); > > @@ -82,13 +87,36 @@ static int s5p_mfc_alloc_codec_buffers_v6(struct s5p_mfc_ctx *ctx) > > ctx->tmv_buffer_size = S5P_FIMV_NUM_TMV_BUFFERS_V6 * > > ALIGN(S5P_FIMV_TMV_BUFFER_SIZE_V6(mb_width, mb_height), > > S5P_FIMV_TMV_BUFFER_ALIGN_V6); > > - > > - ctx->luma_dpb_size = ALIGN((mb_width * mb_height) * > > - S5P_FIMV_LUMA_MB_TO_PIXEL_V6, > > - S5P_FIMV_LUMA_DPB_BUFFER_ALIGN_V6); > > - 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_MFCV10(dev)) { > > + lcu_width = enc_lcu_width(ctx->img_width); > > + lcu_height = enc_lcu_height(ctx->img_height); > > + if (ctx->codec_mode != S5P_FIMV_CODEC_HEVC_ENC) { > > + ctx->luma_dpb_size = > > + ALIGN(calc_param((mb_width * 16), 64) > > + * calc_param((mb_height * 16), 32) > > + + 64, 64); > ALIGN is not necessary here, as argument is already aligned. I will remove ALIGN and take care of the same for below. > > + ctx->chroma_dpb_size = > > + ALIGN(calc_param((mb_width * 16), 64) > > + * (mb_height * 8) > > + + 64, 64); > > ditto > > + } else { > > + ctx->luma_dpb_size = > > + ALIGN(calc_param((lcu_width * 32), 64) > > + * calc_param((lcu_height * 32), 32) > > + + 64, 64); > ditto > > + ctx->chroma_dpb_size = > > + ALIGN(calc_param((lcu_width * 32), 64) > > + * (lcu_height * 16) > > + + 64, 64); > > ditto > > > + } > > + } else { > > + ctx->luma_dpb_size = ALIGN((mb_width * mb_height) * > > + S5P_FIMV_LUMA_MB_TO_PIXEL_V6, > > + S5P_FIMV_LUMA_DPB_BUFFER_ALIGN_V6); > > + 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_PLUS(dev)) > > ctx->me_buffer_size = ALIGN(S5P_FIMV_ME_BUFFER_SIZE_V8( > > ctx->img_width, ctx->img_height, > > @@ -197,6 +225,8 @@ static int s5p_mfc_alloc_codec_buffers_v6(struct s5p_mfc_ctx *ctx) > > case S5P_MFC_CODEC_H264_ENC: > > if (IS_MFCV10(dev)) { > > mfc_debug(2, "Use min scratch buffer size\n"); > > + ctx->me_buffer_size = > > + ALIGN(ENC_V100_H264_ME_SIZE(mb_width, mb_height), 16); > > } else if (IS_MFCV8_PLUS(dev)) > > ctx->scratch_buf_size = > > S5P_FIMV_SCRATCH_BUF_SIZE_H264_ENC_V8( > > @@ -219,6 +249,9 @@ static int s5p_mfc_alloc_codec_buffers_v6(struct s5p_mfc_ctx *ctx) > > case S5P_MFC_CODEC_H263_ENC: > > if (IS_MFCV10(dev)) { > > mfc_debug(2, "Use min scratch buffer size\n"); > > + ctx->me_buffer_size = > > + ALIGN(ENC_V100_MPEG4_ME_SIZE(mb_width, > > + mb_height), 16); > > } else > > ctx->scratch_buf_size = > > S5P_FIMV_SCRATCH_BUF_SIZE_MPEG4_ENC_V6( > > @@ -235,7 +268,10 @@ static int s5p_mfc_alloc_codec_buffers_v6(struct s5p_mfc_ctx *ctx) > > case S5P_MFC_CODEC_VP8_ENC: > > if (IS_MFCV10(dev)) { > > mfc_debug(2, "Use min scratch buffer size\n"); > > - } else if (IS_MFCV8_PLUS(dev)) > > + ctx->me_buffer_size = > > + ALIGN(ENC_V100_VP8_ME_SIZE(mb_width, mb_height), > > + 16); > > + } else if (IS_MFCV8_PLUS(dev)) > > ctx->scratch_buf_size = > > S5P_FIMV_SCRATCH_BUF_SIZE_VP8_ENC_V8( > > mb_width, > > @@ -395,13 +431,15 @@ static void s5p_mfc_dec_calc_dpb_size_v6(struct s5p_mfc_ctx *ctx) > > > > if (ctx->codec_mode == S5P_MFC_CODEC_H264_DEC || > > ctx->codec_mode == S5P_MFC_CODEC_H264_MVC_DEC) { > > - if (IS_MFCV10(dev)) > > + if (IS_MFCV10(dev)) { > > ctx->mv_size = S5P_MFC_DEC_MV_SIZE_V10(ctx->img_width, > > ctx->img_height); > > - else > > + ctx->mv_size = ALIGN(ctx->mv_size, 32); > > + } else { > > ctx->mv_size = S5P_MFC_DEC_MV_SIZE_V6(ctx->img_width, > > ctx->img_height); > > - ctx->mv_size = ALIGN(ctx->mv_size, 16); > > + ctx->mv_size = ALIGN(ctx->mv_size, 16); > > Already aligned I will remove the alignment. Thank you for the review. Regards, Smitha T Murthy > > > + } > > } else { > > ctx->mv_size = 0; > > } > > @@ -598,15 +636,34 @@ static int s5p_mfc_set_enc_ref_buffer_v6(struct s5p_mfc_ctx *ctx) > > > > mfc_debug(2, "Buf1: %p (%d)\n", (void *)buf_addr1, buf_size1); > > > > - for (i = 0; i < ctx->pb_count; i++) { > > - writel(buf_addr1, mfc_regs->e_luma_dpb + (4 * i)); > > - buf_addr1 += ctx->luma_dpb_size; > > - writel(buf_addr1, mfc_regs->e_chroma_dpb + (4 * i)); > > - buf_addr1 += ctx->chroma_dpb_size; > > - writel(buf_addr1, mfc_regs->e_me_buffer + (4 * i)); > > - buf_addr1 += ctx->me_buffer_size; > > - buf_size1 -= (ctx->luma_dpb_size + ctx->chroma_dpb_size + > > - ctx->me_buffer_size); > > + if (IS_MFCV10(dev)) { > > + /* start address of per buffer is aligned */ > > + for (i = 0; i < ctx->pb_count; i++) { > > + writel(buf_addr1, mfc_regs->e_luma_dpb + (4 * i)); > > + buf_addr1 += ctx->luma_dpb_size; > > + buf_size1 -= ctx->luma_dpb_size; > > + } > > + for (i = 0; i < ctx->pb_count; i++) { > > + writel(buf_addr1, mfc_regs->e_chroma_dpb + (4 * i)); > > + buf_addr1 += ctx->chroma_dpb_size; > > + buf_size1 -= ctx->chroma_dpb_size; > > + } > > + for (i = 0; i < ctx->pb_count; i++) { > > + writel(buf_addr1, mfc_regs->e_me_buffer + (4 * i)); > > + buf_addr1 += ctx->me_buffer_size; > > + buf_size1 -= ctx->me_buffer_size; > > + } > > + } else { > > + for (i = 0; i < ctx->pb_count; i++) { > > + writel(buf_addr1, mfc_regs->e_luma_dpb + (4 * i)); > > + buf_addr1 += ctx->luma_dpb_size; > > + writel(buf_addr1, mfc_regs->e_chroma_dpb + (4 * i)); > > + buf_addr1 += ctx->chroma_dpb_size; > > + writel(buf_addr1, mfc_regs->e_me_buffer + (4 * i)); > > + buf_addr1 += ctx->me_buffer_size; > > + buf_size1 -= (ctx->luma_dpb_size + ctx->chroma_dpb_size > > + + ctx->me_buffer_size); > > + } > > } > > > > writel(buf_addr1, mfc_regs->e_scratch_buffer_addr); > > diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h > > index 021b8db..975bbc5 100644 > > --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h > > +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h > > @@ -26,6 +26,8 @@ > > (((MB_HEIGHT(y)+1)/2)*2) * 64 + 128) > > #define S5P_MFC_DEC_MV_SIZE_V10(x, y) (MB_WIDTH(x) * \ > > (((MB_HEIGHT(y)+1)/2)*2) * 64 + 512) > > +#define enc_lcu_width(x_size) DIV_ROUND_UP(x_size, 32) > > +#define enc_lcu_height(y_size) DIV_ROUND_UP(y_size, 32) > > > > /* Definition */ > > #define ENC_MULTI_SLICE_MB_MAX ((1 << 30) - 1) > > >