From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752400AbdARKKh (ORCPT ); Wed, 18 Jan 2017 05:10:37 -0500 Received: from mailout4.samsung.com ([203.254.224.34]:44412 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752083AbdARKKa (ORCPT ); Wed, 18 Jan 2017 05:10:30 -0500 X-AuditID: b6c32a58-f79946d000005960-15-587f3e630d16 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 04/11] [media] s5p-mfc: Support MFCv10.10 buffer requirements Date: Wed, 18 Jan 2017 15:32:02 +0530 Message-id: <1484733729-25371-5-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: H4sIAAAAAAAAAzVSe0hTURj37O5uM1pd5qOTpYwL0dPlvc51LbcSTQYGSVGswuyixym6B7tb qGX2QJuSoUlo5CgirYT1mA9KDHwMK0rtYWGmI+hBalChrNSs7nbtv9/3/R7n+w6fDFOM41Gy fLMd2cxsISlZIu7oW782NltXZoj7+SueGb09iDNe92sRc+nxWZwZGrorZQZOf5Uyng9vcOZV Z6OEOXe3HWfc3nEp0+z5LWKutc9Imb6vvHi8qwPskOs9LZUSfev1Mv35thagn/bE6Ie9p6QZ +EGUlIfYHGRTInO2JSffbNSS6XuzUrISNHFULJXIbCGVZtaEtGTqrozYtPxCfkZSeZQtdPCt DJbjyM26JJvFYUfKPAtn15KHKIpWUXFbVDRNq9R05lY6gZccQXnPXimsPduL2t/58JOgLr4K hMogoYZTlU9EAo6Ez313JAGsIJoArGiXVoElPD4rgjPV/dh/g7/vwSJxA8CXb79LhOIvgD9c H4NREmIT9H97GowKJxCcvO3GAyKM+AXgqH9EHCDCiN3Qffly0CAm1sDOm7NBg5xIhd/qvVLh OSWcHHEHcSixE9b6xsSBIEjUS+GTT+U8IeOLaOjpXhwvFf740icRcBicfNS2mLMKLjSNAsF7 BkBXxxmxQNQAeKvcIeDtsHu4MdjHiGWwej6wTSBfDp0VCkGihwsX+hfzk+FN73uRsH0DgAPl M6IasPoqCGkBkcjKmYyIS7CqVRxr4hxmoyrbYvKA4GltMNwHfxr29AJCBsil8hB0wqDA2aNc sakXQBlGhsuvaMsMCnkOW1yCbJYsm6MQcb0ggf+nWiwqItvCH6rZnkWpNZSaTqQ1iVQ8Ta6Q Xy3aZlAQRtaOChCyItt/n0gWGnUSXDxgzD22XB+5r2S6aGIhqbvLUKo57HF1zU6gL67jvv3H H1bMJOUmI7sr7HOy6x4WvrKu4HeD88XeseRtgz3pHWmagu6o0qlq5/C6iDq3DouIGfJpOsPS /M7mlBRLabTj+8Y51Zx9IXMweqXJOZdfH6/VvV6j221tnfO/5z7Pk2Iuj6U2YDaO/Qca0ySZ cAMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupikeLIzCtJLcpLzFFi42I5/e+xgG6yXX2EwZfDaha31p1jtTiy9iqT xcwT7awW589vYLc42/SG3WLT42usFpd3zWGz6NmwldVi7ZG77BbLNv1hsli09Qu7xeE3QMV3 92xjdOD12LSqk81j85J6j74tqxg9Pm+S87hypJE9gDXKzSYjNTEltUghNS85PyUzL91WKTTE TddCSSEvMTfVVilC1zckSEmhLDGnFMgzMkADDs4B7sFK+nYJbhlnLgsVHLSv2Hr7HmsD42Tj LkZODgkBE4lvh3eyQ9hiEhfurWfrYuTiEBJYyihx6lITI4TTyCQx+cw2sCo2AR2Jb+9Ps4HY IgKpEmu3nmcFKWIW+MEo0XTgJViRsICvxI577xhBbBYBVYldK36CNfAKuEi8n34Eap2CxKsb a8FsTgFXiYn37rCA2EJANbOOTmacwMi7gJFhFaNEakFyQXFSeq5RXmq5XnFibnFpXrpecn7u JkZwPDyT3sF4eJf7IUYBDkYlHt4A0boIIdbEsuLK3EOMEhzMSiK8823rI4R4UxIrq1KL8uOL SnNSiw8xmgIdNpFZSjQ5HxireSXxhibmJubGBhbmlpYmRkrivI2zn4ULCaQnlqRmp6YWpBbB 9DFxcEo1MHpN1JkiIuGxhfWAgDqvl+fReu8/a17vbFOqvPqIR+Koot50h5KHtxUVA6IKffjd /M/pqh+oqZc/ltHWs8n9glSRjXmxr76jg7GhpgjXiwt3Phgf9fha2l92RFnnxx7u30YmVTNf cPQXBM3d0XNFoih3gu+ybwLTbigefXDV9mRsXrVN55kFSizFGYmGWsxFxYkA0Lyao50CAAA= X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170118100731epcas5p16f07548a8a6c95f2ef539704e032a54d 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: 20170118100731epcas5p16f07548a8a6c95f2ef539704e032a54d X-RootMTR: 20170118100731epcas5p16f07548a8a6c95f2ef539704e032a54d 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 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)) + #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); + } + } 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); } 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) /* Definition */ #define ENC_MULTI_SLICE_MB_MAX ((1 << 30) - 1) -- 1.7.2.3