From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751709AbdBFI5O (ORCPT ); Mon, 6 Feb 2017 03:57:14 -0500 Received: from mailout3.samsung.com ([203.254.224.33]:53646 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751603AbdBFI5K (ORCPT ); Mon, 6 Feb 2017 03:57:10 -0500 X-AuditID: b6c32a28-f79196d00000191c-69-58983a5cb968 Subject: Re: [PATCH 04/11] [media] 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: <1463a143-1f9d-b740-4678-2740105f64eb@samsung.com> Content-type: text/plain; charset=UTF-8 Date: Mon, 06 Feb 2017 14:11:24 +0530 Message-id: <1486370484.16927.83.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: H4sIAAAAAAAAA02SWUwTURSGvZ3OTEFrxqJ4QlxwEgIolLYpZTAibjE1YAIuCSqmTOCmJdKW dFqivlhUxC0E5AUp7mgUZLFSd0GWiEaxJKAYooISXBCCCYgPrm0Ho29f/vv/555zcmSEoowK k+Va7Nhm4fNYKlh6oz2ajc1cXpGhKq6M4Prrn5FcR91zCXfyUTHJeb2NNNe1f5Tm3EMvSK7n ThXFHW/0kFxdx2uau+T+IeHOeyZprn20mFw1S++uOULpr1fv05c01SD9hHuRvrejkE4jt+MV JsznYFs4tmRbc3ItxiQ2ZbNhrSFep1LHqhO5BDbcwptxErsuNS12fW6erz02vIDPc/ikNF4Q 2LiVK2xWhx2Hm6yCPYndoVZrlGpVglKj0Si1mp3LNfE+SxY2ec6USPOn0ncPtpRTTuRJPoqC ZMBoobb8HilyKHS/aaCOomCZgrmIoPNaUeBBwUwg+HKt4G9geGKIEvVGBOVXsJ9DmM3QPuki /EwxMTA1/iTgmctEguvxK8JflGBOS2DsUgPyPwQxyVDScyFgIphoKLr5nfazlImAk+MNAV3O xENf9ZjPL/PxHPh5K0TsYRnUO59KxehiuDlWFagPTDMNz1u+Sfx+YBaC+wEh+teBq+WgVOQQ GOlsokUOg8euQVrMHkBw6saBaVMpgitFDpGT4UFv1fRns6HqWOt0fTkcPqQQLXr4eeIhJfJq uNwxKBGXeFgCzru90lK0qPK/MSv/jVP53whnEVGDQnG+YDZiQZvPKQXeLDgsRmW21exGgXNc GnULfTmb0oYYGWJnybN0FRkKki8Q9pjbEMgIdq48PdEnyXP4PXuxzWqwOfKw0IbifVstI8Lm ZVt9x22xG9RanVqrSdTpdImqBHa+fJuqLEPBGHk73oVxPrb9zUlkQWFOdL/Z/Xpc8938fn7k gi5TYefVTMWmNRU/NmTdHuxrLnW1KpbExCye+j20MXVgwNTS1Dc61UqGxnV/9lb035ts/uSM 3D1jJLuue6C2sOdOyK8PzpmZQf1vhu4vMZ7zvF3Nc+2r3nnrfg9vf7kheGvxlhMfvV/bnjak 1kh7I2avjR6PKjOwUsHEq5cSNoH/A9nlHhekAwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrHIsWRmVeSWpSXmKPExsWSnRNsqBtjNSPCYFmvoMWtdedYLY6svcpk MfNEO6vF+fMb2C3ONr1ht9j0+BqrxeVdc9gsejZsZbVYe+Quu8WyTX+YLBZt/cJucfhNO6sD j8emVZ1sHpuX1Hv0bVnF6PF5k5zHlSON7AGsUW42GamJKalFCql5yfkpmXnptkqhIW66FkoK eYm5qbZKEbq+IUFKCmWJOaVAnpEBGnBwDnAPVtK3S3DL2Dq/j6XgW2DFg/2T2RoYt9p3MXJy SAiYSDz9/JgNwhaTuHBvPZDNxSEksI5R4sr9X2AJYYFgicNfZjOD2GwCOhLf3p8Gi4sIqEvM PnmHGaSBWWAmk8TfPd/AijgF7CX6Li+GmtTNJHF3zjqwBLOApkTr9t/sIDaLgKrEzPfrwSbx CphKXF/ylrGLkQPIFpT4u0MY4iJtiXUNZ1ggWuUltr+dwzyBkX8WkkmzEDpmIalawMi8ilEs taA4Nz23uMDARK84Mbe4NC9dLzk/dxMjMO62HVaS3MG4aoXXIUYBDkYlHt6ASdMjhFgTy4or cw8xSnAwK4nwBlrOiBDiTUmsrEotyo8vKs1JLT7EaAp0+ERmKdHkfGBKyCuJNzQxtbCwMLE0 Nja2MFES542d/ixcSCA9sSQ1OzW1ILUIpo+Jg1OqgdFlLaOu2nv/Cx6MTXtFT049H1BasvQB 5/9VV2a8ilcylgzbEuJ075k2+5P362dyWa59+0w0dN/EzBVr/i/8FOBtUa0fN3fvpf4HHCs1 y08ecmTm06pf8WJ/aGq2zJ3zDK//FM5MrLN/U7K3Xzaq1JydjXvmgRm1EpVRueYCB9pF2hcn cnCuXKjEUpyRaKjFXFScCABIgecL0QIAAA== X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170206085700epcas4p2022fa6adcd6a40d17024c0f0d4a75cb1 X-Msg-Generator: CA X-Sender-IP: 182.195.34.25 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: 104P DLP-Filter: Pass X-CFilter-Loop: Reflected X-HopCount: 7 X-CMS-RootMailID: 20170118100731epcas5p16f07548a8a6c95f2ef539704e032a54d X-RootMTR: 20170118100731epcas5p16f07548a8a6c95f2ef539704e032a54d References: <1484733729-25371-1-git-send-email-smitha.t@samsung.com> <1484733729-25371-5-git-send-email-smitha.t@samsung.com> <1463a143-1f9d-b740-4678-2740105f64eb@samsung.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 2017-02-02 at 09:30 +0100, Andrzej Hajda wrote: > Hi Smitha, > > Ups, I have missed this patch, I hope it wont influence the review :) > > > On 18.01.2017 11:02, 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 | 13 +++ > > drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 97 ++++++++++++++++++----- > > drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h | 2 + > > 3 files changed, 91 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..153ee68 100644 > > --- a/drivers/media/platform/s5p-mfc/regs-mfc-v10.h > > +++ b/drivers/media/platform/s5p-mfc/regs-mfc-v10.h > > @@ -32,5 +32,18 @@ > > #define MFC_VERSION_V10 0xA0 > > #define MFC_NUM_PORTS_V10 1 > > > > +/* Encoder buffer size for MFC v10.0 */ > > +#define ENC_V100_H264_ME_SIZE(x, y) \ > > + (((x + 3) * (y + 3) * 8) \ > > + + ((((x * y) + 63) / 64) * 32) \ > > + + (((y * 64) + 1280) * (x + 7) / 8)) > > +#define ENC_V100_MPEG4_ME_SIZE(x, y) \ > > + (((x + 3) * (y + 3) * 8) \ > > + + ((((x * y) + 127) / 128) * 16) \ > > + + (((y * 64) + 1280) * (x + 7) / 8)) > > +#define ENC_V100_VP8_ME_SIZE(x, y) \ > > + (((x + 3) * (y + 3) * 8) \ > > + + (((y * 64) + 1280) * (x + 7) / 8)) > > + > > Crazy, cryptic math here, I guess you can make it more readable by using > DIV_ROUND_UP macro and abstracting out common parts, for example: > > #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) > > I put the equation as I had found in the User Manual, so that it will help in quick reference check in future. But I will change it as per your suggestion. > > #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 faceee6..369210a 100644 > > --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c > > +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c > > @@ -64,6 +64,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 +75,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 +85,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((((mb_width * 16) + 63) / 64) > > + * 64 * (((mb_height * 16) + 31) > > + / 32) * 32 + 64, 64); > > + ctx->chroma_dpb_size = > > + ALIGN((((mb_width * 16) + 63) / 64) > > + * 64 * (mb_height * 8) > > + + 64, 64); > > + } else { > > + ctx->luma_dpb_size = > > + ALIGN((((lcu_width * 32) + 63) / 64) > > + * 64 * (((lcu_height * 32) + 31) > > + / 32) * 32 + 64, 64); > > + ctx->chroma_dpb_size = > > + ALIGN((((lcu_width * 32) + 63) / 64) > > + * 64 * (lcu_height * 16) > > + + 64, 64); > > Again crazy math, please try to avoid repetitive calculations, replace > all constructs of form (x + n - 1) / n, with DIV_ROUND_UP(x, n), verify > if ALIGN is necessary. I will add the DIV_ROUND_UP. Since ALIGN was there for other versions too, I followed the same. > > > + } > > + } 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 +223,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); > > This and similar entries below should be in previous patch, again check > if ALIGN is needed. I will take these changes in the previous patch in the next version. > > } else if (IS_MFCV8_PLUS(dev)) > > ctx->scratch_buf_size = > > S5P_FIMV_SCRATCH_BUF_SIZE_H264_ENC_V8( > > @@ -219,6 +247,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 +266,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 +429,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); > > + } > > } else { > > ctx->mv_size = 0; > > } > > @@ -607,15 +643,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 fcc2368..2b5a9f4 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) ((x_size + 31) / 32) > > +#define enc_lcu_height(y_size) ((y_size + 31) / 32) > > DIV_ROUND_UP > > > Regards > Andrzej > Yes I will correct it. Thank you for the review. Regards, Smitha > > > > /* Definition */ > > #define ENC_MULTI_SLICE_MB_MAX ((1 << 30) - 1) > > > From mboxrd@z Thu Jan 1 00:00:00 1970 From: smitha.t@samsung.com (Smitha T Murthy) Date: Mon, 06 Feb 2017 14:11:24 +0530 Subject: [PATCH 04/11] [media] s5p-mfc: Support MFCv10.10 buffer requirements In-Reply-To: <1463a143-1f9d-b740-4678-2740105f64eb@samsung.com> References: <1484733729-25371-1-git-send-email-smitha.t@samsung.com> <1484733729-25371-5-git-send-email-smitha.t@samsung.com> <1463a143-1f9d-b740-4678-2740105f64eb@samsung.com> Message-ID: <1486370484.16927.83.camel@smitha-fedora> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Thu, 2017-02-02 at 09:30 +0100, Andrzej Hajda wrote: > Hi Smitha, > > Ups, I have missed this patch, I hope it wont influence the review :) > > > On 18.01.2017 11:02, 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 | 13 +++ > > drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 97 ++++++++++++++++++----- > > drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h | 2 + > > 3 files changed, 91 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..153ee68 100644 > > --- a/drivers/media/platform/s5p-mfc/regs-mfc-v10.h > > +++ b/drivers/media/platform/s5p-mfc/regs-mfc-v10.h > > @@ -32,5 +32,18 @@ > > #define MFC_VERSION_V10 0xA0 > > #define MFC_NUM_PORTS_V10 1 > > > > +/* Encoder buffer size for MFC v10.0 */ > > +#define ENC_V100_H264_ME_SIZE(x, y) \ > > + (((x + 3) * (y + 3) * 8) \ > > + + ((((x * y) + 63) / 64) * 32) \ > > + + (((y * 64) + 1280) * (x + 7) / 8)) > > +#define ENC_V100_MPEG4_ME_SIZE(x, y) \ > > + (((x + 3) * (y + 3) * 8) \ > > + + ((((x * y) + 127) / 128) * 16) \ > > + + (((y * 64) + 1280) * (x + 7) / 8)) > > +#define ENC_V100_VP8_ME_SIZE(x, y) \ > > + (((x + 3) * (y + 3) * 8) \ > > + + (((y * 64) + 1280) * (x + 7) / 8)) > > + > > Crazy, cryptic math here, I guess you can make it more readable by using > DIV_ROUND_UP macro and abstracting out common parts, for example: > > #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) > > I put the equation as I had found in the User Manual, so that it will help in quick reference check in future. But I will change it as per your suggestion. > > #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 faceee6..369210a 100644 > > --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c > > +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c > > @@ -64,6 +64,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 +75,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 +85,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((((mb_width * 16) + 63) / 64) > > + * 64 * (((mb_height * 16) + 31) > > + / 32) * 32 + 64, 64); > > + ctx->chroma_dpb_size = > > + ALIGN((((mb_width * 16) + 63) / 64) > > + * 64 * (mb_height * 8) > > + + 64, 64); > > + } else { > > + ctx->luma_dpb_size = > > + ALIGN((((lcu_width * 32) + 63) / 64) > > + * 64 * (((lcu_height * 32) + 31) > > + / 32) * 32 + 64, 64); > > + ctx->chroma_dpb_size = > > + ALIGN((((lcu_width * 32) + 63) / 64) > > + * 64 * (lcu_height * 16) > > + + 64, 64); > > Again crazy math, please try to avoid repetitive calculations, replace > all constructs of form (x + n - 1) / n, with DIV_ROUND_UP(x, n), verify > if ALIGN is necessary. I will add the DIV_ROUND_UP. Since ALIGN was there for other versions too, I followed the same. > > > + } > > + } 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 +223,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); > > This and similar entries below should be in previous patch, again check > if ALIGN is needed. I will take these changes in the previous patch in the next version. > > } else if (IS_MFCV8_PLUS(dev)) > > ctx->scratch_buf_size = > > S5P_FIMV_SCRATCH_BUF_SIZE_H264_ENC_V8( > > @@ -219,6 +247,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 +266,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 +429,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); > > + } > > } else { > > ctx->mv_size = 0; > > } > > @@ -607,15 +643,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 fcc2368..2b5a9f4 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) ((x_size + 31) / 32) > > +#define enc_lcu_height(y_size) ((y_size + 31) / 32) > > DIV_ROUND_UP > > > Regards > Andrzej > Yes I will correct it. Thank you for the review. Regards, Smitha > > > > /* Definition */ > > #define ENC_MULTI_SLICE_MB_MAX ((1 << 30) - 1) > > >