From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752760AbdARKWU (ORCPT ); Wed, 18 Jan 2017 05:22:20 -0500 Received: from mailout2.samsung.com ([203.254.224.25]:35857 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752718AbdARKWP (ORCPT ); Wed, 18 Jan 2017 05:22:15 -0500 X-AuditID: b6c32a36-f79d86d000003cda-59-587f3e7d7d7e 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 08/11] [media] s5p-mfc: Add VP9 decoder support Date: Wed, 18 Jan 2017 15:32:06 +0530 Message-id: <1484733729-25371-9-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: H4sIAAAAAAAAAzVSa0hTYRju29m5KK6O89KHZYwDRUbOncOcp/JWWSzUkvpjRtpBP5y0i+1s lkGpSVlmpeIPA81uKi2mNS9ZCcmU7F5ghY60IIhcZWqmId3mTv17nvd9nvd5v4+XwpRv8Qiq wGxDVrNgZIhAeXd/lCb6SGJJpua6V8F72p7h/IDzlYw//6AC558/v0HyT499JnnX+9c4P3Sn geCrbnThvHNglORbXD9l/OWuGZLv/+wTj/Z2g2SF3uU4Reg7rpboz3Y6gP6ba4X+5UAZmYFn oXgDEvKQVYXMuZa8AnN+ApO6K2dzTqxOw0az6/g4RmUWTCiBSUnLiN5aYPTtyKiKBKPdV8oQ RJGJSYy3Wuw2pDJYRFsCs4dlOTWriVNzHKfWcnvXc7E+yT5k6OiqIwpPxxx6O9RBlILq1ZUg gIK0FrY4Z3AJh8MXY+1EJQiklHQPgOOfzmASqZDBR55x/L9j5mMLLjVaAXTfvyuXyB8Arznq ZQsqgl4LZ78+JhZwKI2gt83pd2D0DwA9s8PyhUYInQQ9vbV+kZxeCad6x/11BZ0Cb03dlUtx KugddpILOIDeAmvG3vjTIH2BhPcGZ0EloHwkErr6MEmfAh/UTRESDoHewU5Swsug47dHJnnL AWzsLv8XUO1b+7hdwkmw72WDv47Ri+HE9ypcmq+AJ08oJYke1paN/Ju/EboGJknp9fUA/mq+ glWD5RfBIgcIR4WiKR+JbCGnFgWTaDfnq3MtJhfwH9caXQ+4/CzNDWgKMEGKjLCjmUpcKBKL TW4AKYwJVTQllGQqFXlC8WFkteRY7UYkukGs759qsIiwXIvvVM22HFarY7WcVhOn43kts1Rx pWxDppLOF2xoP0KFyPrfJ6MCIkpBZ0tUAWUc7p/jGrYP4bdne7S9pr6aVZov8wE/l9zMjq8K qs9OfPVNqTa8y97xwXYgVTadqAvKKgpOTp+4uWinatr5pH6Tdzx0ulRmCUsr62xsbppfVp4e syK46lbrpXMHsjYdPpi1e/LhuubTee5fI5GeBmowcG5p+7atobQ8ZN7AyEWDwK7BrKLwF1OV 6qlyAwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupikeLIzCtJLcpLzFFi42I5/e+xgG6NXX2EwdlTwha31p1jtTiy9iqT xcwT7awW589vYLc42/SG3WLT42usFpd3zWGz6NmwldVi7ZG77BbLNv1hsli09Qu7xeE3QMV3 92xjdOD12LSqk81j85J6j74tqxg9Pm+S87hypJE9gDXKzSYjNTEltUghNS85PyUzL91WKTTE TddCSSEvMTfVVilC1zckSEmhLDGnFMgzMkADDs4B7sFK+nYJbhmbt05hK+jWr7h/eTNbA+ME jS5GTg4JAROJLy+WsULYYhIX7q1nA7GFBJYySrw4adzFyAVkNzJJfPm5hAkkwSagI/Ht/Wmw IhGBVIm1W8+zghQxC/xglGg68JIdJCEsYC9xa88ksCIWAVWJj3tesoDYvAIuEts/7maB2KYg 8erGWrB6TgFXiYn37rBAbHaRmHV0MuMERt4FjAyrGCVSC5ILipPScw3zUsv1ihNzi0vz0vWS 83M3MYLj4ZnUDsaDu9wPMQpwMCrx8Co01kUIsSaWFVfmHmKU4GBWEuGdb1sfIcSbklhZlVqU H19UmpNafIjRFOiwicxSosn5wFjNK4k3NDE3MTc2sDC3tDQxUhLnbZz9LFxIID2xJDU7NbUg tQimj4mDU6qBcden8idH36y8eUZi19E5q35ZX17KsWhWW5yP3zyVpF+zHs+Sf2qSyyIqeOyK ROONby4FDbNbd8f7F1r53PN3P+a57ITnyqIY0fOFWmcqV7XzxbflHJMVqZnhGet1weFF6eeP IU6bD5lu1m7x+VaXs6/3w76wp6fTLBZc52Y/uybZ+c4//ybVUiWW4oxEQy3mouJEANlicFKd AgAA X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170118100756epcas1p2c8a93b383a4c85648b5e9efac8cea9c7 X-Msg-Generator: CA X-Sender-IP: 203.254.230.26 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: 20170118100756epcas1p2c8a93b383a4c85648b5e9efac8cea9c7 X-RootMTR: 20170118100756epcas1p2c8a93b383a4c85648b5e9efac8cea9c7 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 Add support for codec definition and corresponding buffer requirements for VP9 decoder. Signed-off-by: Smitha T Murthy --- drivers/media/platform/s5p-mfc/regs-mfc-v10.h | 6 +++++ drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c | 3 ++ drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 1 + drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 8 ++++++ drivers/media/platform/s5p-mfc/s5p_mfc_opr.h | 2 + drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 28 +++++++++++++++++++++++ 6 files changed, 48 insertions(+), 0 deletions(-) diff --git a/drivers/media/platform/s5p-mfc/regs-mfc-v10.h b/drivers/media/platform/s5p-mfc/regs-mfc-v10.h index a57009a..81a0a96 100644 --- a/drivers/media/platform/s5p-mfc/regs-mfc-v10.h +++ b/drivers/media/platform/s5p-mfc/regs-mfc-v10.h @@ -18,6 +18,8 @@ /* MFCv10 register definitions*/ #define S5P_FIMV_MFC_CLOCK_OFF_V10 0x7120 #define S5P_FIMV_MFC_STATE_V10 0x7124 +#define S5P_FIMV_D_STATIC_BUFFER_ADDR_V10 0xF570 +#define S5P_FIMV_D_STATIC_BUFFER_SIZE_V10 0xF574 /* MFCv10 Context buffer sizes */ #define MFC_CTX_BUF_SIZE_V10 (30 * SZ_1K) /* 30KB */ @@ -34,6 +36,10 @@ /* MFCv10 codec defines*/ #define S5P_FIMV_CODEC_HEVC_DEC 17 +#define S5P_FIMV_CODEC_VP9_DEC 18 + +/* Decoder buffer size for MFC v10 */ +#define DEC_VP9_STATIC_BUFFER_SIZE 20480 /* Encoder buffer size for MFC v10.0 */ #define ENC_V100_H264_ME_SIZE(x, y) \ diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c b/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c index 76eca67..102b47e 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c @@ -104,6 +104,9 @@ static int s5p_mfc_open_inst_cmd_v6(struct s5p_mfc_ctx *ctx) case S5P_MFC_CODEC_HEVC_DEC: codec_type = S5P_FIMV_CODEC_HEVC_DEC; break; + case S5P_MFC_CODEC_VP9_DEC: + codec_type = S5P_FIMV_CODEC_VP9_DEC; + break; case S5P_MFC_CODEC_H264_ENC: codec_type = S5P_FIMV_CODEC_H264_ENC_V6; break; diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h index 5c46060..e720ce6 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h @@ -80,6 +80,7 @@ static inline dma_addr_t s5p_mfc_mem_cookie(void *a, void *b) #define S5P_MFC_CODEC_VC1RCV_DEC 6 #define S5P_MFC_CODEC_VP8_DEC 7 #define S5P_MFC_CODEC_HEVC_DEC 17 +#define S5P_MFC_CODEC_VP9_DEC 18 #define S5P_MFC_CODEC_H264_ENC 20 #define S5P_MFC_CODEC_H264_MVC_ENC 21 diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c index 9f459b3..93626ed 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c @@ -164,6 +164,14 @@ .num_planes = 1, .versions = MFC_V10_BIT, }, + { + .name = "VP9 Encoded Stream", + .fourcc = V4L2_PIX_FMT_VP9, + .codec_mode = S5P_FIMV_CODEC_VP9_DEC, + .type = MFC_FMT_DEC, + .num_planes = 1, + .versions = MFC_V10_BIT, + }, }; #define NUM_FORMATS ARRAY_SIZE(formats) diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.h b/drivers/media/platform/s5p-mfc/s5p_mfc_opr.h index 6478f70..565decf 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.h +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr.h @@ -170,6 +170,8 @@ struct s5p_mfc_regs { void __iomem *d_used_dpb_flag_upper;/* v7 and v8 */ void __iomem *d_used_dpb_flag_lower;/* v7 and v8 */ void __iomem *d_min_scratch_buffer_size; /* v10 */ + void __iomem *d_static_buffer_addr; /* v10 */ + void __iomem *d_static_buffer_size; /* v10 */ /* encoder registers */ void __iomem *e_frame_width; 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 b6cb280..da4202f 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c @@ -227,6 +227,13 @@ static int s5p_mfc_alloc_codec_buffers_v6(struct s5p_mfc_ctx *ctx) ctx->scratch_buf_size + (ctx->mv_count * ctx->mv_size); break; + case S5P_MFC_CODEC_VP9_DEC: + mfc_debug(2, "Use min scratch buffer size\n"); + ctx->scratch_buf_size = ALIGN(ctx->scratch_buf_size, 256); + ctx->bank1.size = + ctx->scratch_buf_size + + DEC_VP9_STATIC_BUFFER_SIZE; + break; case S5P_MFC_CODEC_H264_ENC: if (IS_MFCV10(dev)) { mfc_debug(2, "Use min scratch buffer size\n"); @@ -338,6 +345,7 @@ static int s5p_mfc_alloc_instance_buffer_v6(struct s5p_mfc_ctx *ctx) case S5P_MFC_CODEC_VC1_DEC: case S5P_MFC_CODEC_MPEG2_DEC: case S5P_MFC_CODEC_VP8_DEC: + case S5P_MFC_CODEC_VP9_DEC: ctx->ctx.size = buf_size->other_dec_ctx; break; case S5P_MFC_CODEC_H264_ENC: @@ -579,6 +587,14 @@ static int s5p_mfc_set_dec_frame_buffer_v6(struct s5p_mfc_ctx *ctx) } } + if (ctx->codec_mode == S5P_FIMV_CODEC_VP9_DEC) { + writel(buf_addr1, mfc_regs->d_static_buffer_addr); + writel(DEC_VP9_STATIC_BUFFER_SIZE, + mfc_regs->d_static_buffer_size); + buf_addr1 += DEC_VP9_STATIC_BUFFER_SIZE; + buf_size1 -= DEC_VP9_STATIC_BUFFER_SIZE; + } + mfc_debug(2, "Buf1: %zu, buf_size1: %d (frames %d)\n", buf_addr1, buf_size1, ctx->total_dpb_count); if (buf_size1 < 0) { @@ -2286,6 +2302,18 @@ static unsigned int s5p_mfc_get_crop_info_v_v6(struct s5p_mfc_ctx *ctx) R(e_h264_options, S5P_FIMV_E_H264_OPTIONS_V8); R(e_min_scratch_buffer_size, S5P_FIMV_E_MIN_SCRATCH_BUFFER_SIZE_V8); + if (!IS_MFCV10(dev)) + goto done; + + /* Initialize registers used in MFC v10 only. + * Also, over-write the registers which have + * a different offset for MFC v10. + */ + + /* decoder registers */ + R(d_static_buffer_addr, S5P_FIMV_D_STATIC_BUFFER_ADDR_V10); + R(d_static_buffer_size, S5P_FIMV_D_STATIC_BUFFER_SIZE_V10); + done: return &mfc_regs; #undef S5P_MFC_REG_ADDR -- 1.7.2.3