From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751133AbdBBIjT (ORCPT ); Thu, 2 Feb 2017 03:39:19 -0500 Received: from mailout4.w1.samsung.com ([210.118.77.14]:42475 "EHLO mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750985AbdBBIjR (ORCPT ); Thu, 2 Feb 2017 03:39:17 -0500 X-AuditID: cbfec7ef-f79d26d00000420c-6b-5892f033bec7 Subject: Re: [PATCH 08/11] [media] s5p-mfc: Add VP9 decoder support To: Smitha T Murthy , 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, mchehab@kernel.org, pankaj.dubey@samsung.com, krzk@kernel.org, m.szyprowski@samsung.com, s.nawrocki@samsung.com From: Andrzej Hajda Message-id: <0b2fc4bf-347e-f4d3-1004-d5816fb32cfa@samsung.com> Date: Thu, 02 Feb 2017 09:39:10 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.5.1 MIME-version: 1.0 In-reply-to: <1484733729-25371-9-git-send-email-smitha.t@samsung.com> Content-type: text/plain; charset=windows-1252 Content-transfer-encoding: 7bit X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrJKsWRmVeSWpSXmKPExsWy7djP87rGHyZFGCx9YWhxZO1VJouZJ9pZ Lc6f38BucbbpDbvFpsfXWC0u75rDZtGzYSurxdojd9ktlm36w2SxaOsXdovDb4CK7+7ZxujA 47FpVSebx+Yl9R59W1YxenzeJOdx5UgjewBrFJdNSmpOZllqkb5dAlfGrNZJjAXHjSq6m9+x NTDO0Opi5OSQEDCReHh3JTuELSZx4d56ti5GLg4hgWWMEh+/NrFDOJ8ZJS7d+M8O0/G8Zz4j XNXk7hZWCOcZo8T3aTeBqjg4hAWcJX7tDwGJiwj0M0rs2nqLGaSbWWAno0TziUoQm01AU+Lv 5ptsIDavgJ3EnFMLwWpYBFQllv1oZQWxRQUiJA4du80MUSMo8WPyPRaQ+ZwCrhK/L2dBjDSQ mDHlMBOELS+xec1bZohDT7FLzL+jC1IuISArsekAVNhF4uDudYwQtrDEq+NboP6SkejsOMgE crKEQDejxKf+E+wQzhRGiX8fZkB1W0scPn6RFWIZn8SkbdOZIRbwSnS0CUGUeEhMaoR4S0LA UWLTkQ/QULzMKHHvfzvrBEb5WUjemYXkh1lIfljAyLyKUSS1tDg3PbXYUK84Mbe4NC9dLzk/ dxMjMAGd/nf8/Q7Gp80hhxgFOBiVeHgzxCZFCLEmlhVX5h5ilOBgVhLhNXgBFOJNSaysSi3K jy8qzUktPsQozcGiJM67d8GVcCGB9MSS1OzU1ILUIpgsEwenVAOjtksvt6zYAmXu5sAnU/+f tRJMT3jdMPWiR6bMPm/JWiaRpHl9n685PfL4v6JkZZ3yuYwKGTY3vqLFljsZutPLWkQDPk/d xSoWnGL5afPicr2DgYtNVC79F7z//0O73quNByYe33T726l1vs+Y5vooixpy39mnn+AtvGBf eer9v2vymLVfftuixFKckWioxVxUnAgAnaPuMTwDAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrOIsWRmVeSWpSXmKPExsVy+t/xa7plHyZFGNz6wGVxZO1VJouZJ9pZ Lc6f38BucbbpDbvFpsfXWC0u75rDZtGzYSurxdojd9ktlm36w2SxaOsXdovDb4CK7+7ZxujA 47FpVSebx+Yl9R59W1YxenzeJOdx5UgjewBrlJtNRmpiSmqRQmpecn5KZl66rVJoiJuuhZJC XmJuqq1ShK5vSJCSQlliTimQZ2SABhycA9yDlfTtEtwyZrVOYiw4blTR3fyOrYFxhlYXIyeH hICJxPOe+YwQtpjEhXvr2boYuTiEBJYwSiy7vpAFwnnGKNF2ax1QFQeHsICzxK/9ISBxEYF+ RokD79vZIYouM0p86doI1sEssJNR4u6B+Swgc9kENCX+br7JBmLzCthJzDm1kBnEZhFQlVj2 o5UVZKqoQIREw+F0iBJBiR+T77GAhDkFXCV+X84CMZkF9CTuXwQ7mllAXmLzmrfMExgFZiFp mIVQNQtJ1QJG5lWMIqmlxbnpucWGesWJucWleel6yfm5mxiBkbjt2M/NOxgvbQw+xCjAwajE w3tAYlKEEGtiWXFl7iFGCQ5mJRFegxdAId6UxMqq1KL8+KLSnNTiQ4ymQA9MZJYSTc4HJom8 knhDE0NzS0MjYwsLcyMjJXHekg9XwoUE0hNLUrNTUwtSi2D6mDg4pRoYswwn82Z/2VYu78d/ UTSlaRZTxU+uV/LyjDuTPXfk9/5cK5NdIh8e8eDhmXwDl4DuvQWBpzZo7lZXXJ3prFHTrZ3/ pemxk1Ohxcs8xWmJp1sPFO+a967BQyNBu2bOqsMBW23zVSyCtzknljZ4z2p5W/VFvct4cfgN 5rJDXEI3nfWOHo1PPa3EUpyRaKjFXFScCADMGAav2gIAAA== X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170202083912eucas1p10179dd6304718d0b23a06bc25ca35cf4 X-Msg-Generator: CA X-Sender-IP: 182.198.249.179 X-Local-Sender: =?UTF-8?B?QW5kcnplaiBIYWpkYRtTUlBPTC1LZXJuZWwgKFRQKRvsgrw=?= =?UTF-8?B?7ISx7KCE7J6QG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Global-Sender: =?UTF-8?B?QW5kcnplaiBIYWpkYRtTUlBPTC1LZXJuZWwgKFRQKRtTYW1z?= =?UTF-8?B?dW5nIEVsZWN0cm9uaWNzG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Sender-Code: =?UTF-8?B?QzEwG0VIURtDMTBDRDAyQ0QwMjczOTI=?= CMS-TYPE: 201P X-HopCount: 7 X-CMS-RootMailID: 20170118100756epcas1p2c8a93b383a4c85648b5e9efac8cea9c7 X-RootMTR: 20170118100756epcas1p2c8a93b383a4c85648b5e9efac8cea9c7 References: <1484733729-25371-1-git-send-email-smitha.t@samsung.com> <1484733729-25371-9-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 18.01.2017 11:02, Smitha T Murthy wrote: > 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); Again ALIGN and magic number. Beside this: Reviewed-by: Andrzej Hajda > + 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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: a.hajda@samsung.com (Andrzej Hajda) Date: Thu, 02 Feb 2017 09:39:10 +0100 Subject: [PATCH 08/11] [media] s5p-mfc: Add VP9 decoder support In-Reply-To: <1484733729-25371-9-git-send-email-smitha.t@samsung.com> References: <1484733729-25371-1-git-send-email-smitha.t@samsung.com> <1484733729-25371-9-git-send-email-smitha.t@samsung.com> Message-ID: <0b2fc4bf-347e-f4d3-1004-d5816fb32cfa@samsung.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 18.01.2017 11:02, Smitha T Murthy wrote: > 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); Again ALIGN and magic number. Beside this: Reviewed-by: Andrzej Hajda > + 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