Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5;
From:   "Aakarsh Jain" <aakarsh.jain@samsung.com>
To:     "'Hans Verkuil'" <hverkuil-cisco@xs4all.nl>,
        <linux-arm-kernel@lists.infradead.org>,
        <linux-media@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
        <devicetree@vger.kernel.org>
Cc:     <m.szyprowski@samsung.com>, <andrzej.hajda@intel.com>,
        <mchehab@kernel.org>, <krzysztof.kozlowski+dt@linaro.org>,
        <dillon.minfei@gmail.com>, <david.plowman@raspberrypi.com>,
        <mark.rutland@arm.com>, <robh+dt@kernel.org>,
        <conor+dt@kernel.org>, <linux-samsung-soc@vger.kernel.org>,
        <andi@etezian.org>, <gost.dev@samsung.com>,
        <alim.akhtar@samsung.com>, <aswani.reddy@samsung.com>,
        <pankaj.dubey@samsung.com>, <ajaykumar.rs@samsung.com>,
        <linux-fsd@tesla.com>,
        "'Smitha T Murthy'" <smithatmurthy@gmail.com>
In-Reply-To: <d7aa0485-2f67-497d-bca4-8111fa68d27d@xs4all.nl>
Subject: RE: [Patch v4 03/11] media: s5p-mfc: Add initial support for MFCv12
Date:   Mon, 27 Nov 2023 12:14:36 +0530
Message-ID: <0fe301da20fd$32f8ecc0$98eac640$@samsung.com>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Thread-Index: AQLm4twfZx4yvmLB3iF6RxvUJv+HzQIIuTk5ALqF0vYBYW6Pna5TDfLA
Content-Language: en-in
Content-Type: text/plain; charset="utf-8"
CMS-TYPE: 105P
DLP-Filter: Pass
References: <20231025102216.50480-1-aakarsh.jain@samsung.com>
        <CGME20231025102240epcas5p1551ac81bc2cd45f6c84e2eebc11571c4@epcas5p1.samsung.com>
        <20231025102216.50480-4-aakarsh.jain@samsung.com>
        <d7aa0485-2f67-497d-bca4-8111fa68d27d@xs4all.nl>
Precedence: bulk

Hi Hans,

> -----Original Message-----
> From: Hans Verkuil <hverkuil-cisco=40xs4all.nl>
> Sent: 22 November 2023 21:04
> To: Aakarsh Jain <aakarsh.jain=40samsung.com>; linux-arm-
> kernel=40lists.infradead.org; linux-media=40vger.kernel.org; linux-
> kernel=40vger.kernel.org; devicetree=40vger.kernel.org
> Cc: m.szyprowski=40samsung.com; andrzej.hajda=40intel.com;
> mchehab=40kernel.org; krzysztof.kozlowski+dt=40linaro.org;
> dillon.minfei=40gmail.com; david.plowman=40raspberrypi.com;
> mark.rutland=40arm.com; robh+dt=40kernel.org; conor+dt=40kernel.org; linu=
x-
> samsung-soc=40vger.kernel.org; andi=40etezian.org; gost.dev=40samsung.com=
;
> alim.akhtar=40samsung.com; aswani.reddy=40samsung.com;
> pankaj.dubey=40samsung.com; ajaykumar.rs=40samsung.com; linux-
> fsd=40tesla.com; Smitha T Murthy <smithatmurthy=40gmail.com>
> Subject: Re: =5BPatch v4 03/11=5D media: s5p-mfc: Add initial support for=
 MFCv12
>=20
> On 25/10/2023 12:22, Aakarsh Jain wrote:
> > Add support for MFCv12, with a new register file and necessary hw
> > control, decoder, encoder and structural changes. Add luma dbp, chroma
> > dpb and mv sizes for each codec as per the UM for MFCv12, along with
> > appropriate alignment.
> >
> > Cc: linux-fsd=40tesla.com
> > Signed-off-by: Smitha T Murthy <smithatmurthy=40gmail.com>
> > Signed-off-by: Aakarsh Jain <aakarsh.jain=40samsung.com>
> > ---
> >  .../platform/samsung/s5p-mfc/regs-mfc-v12.h   =7C 50 +++++++++++
> >  .../media/platform/samsung/s5p-mfc/s5p_mfc.c  =7C 30 +++++++
> > .../platform/samsung/s5p-mfc/s5p_mfc_common.h =7C 15 +++-
> >  .../platform/samsung/s5p-mfc/s5p_mfc_ctrl.c   =7C  2 +-
> >  .../platform/samsung/s5p-mfc/s5p_mfc_dec.c    =7C  6 +-
> >  .../platform/samsung/s5p-mfc/s5p_mfc_enc.c    =7C  5 +-
> >  .../platform/samsung/s5p-mfc/s5p_mfc_opr.h    =7C  8 +-
> >  .../platform/samsung/s5p-mfc/s5p_mfc_opr_v6.c =7C 83
> > ++++++++++++++++---  .../platform/samsung/s5p-mfc/s5p_mfc_opr_v6.h
> =7C
> > 6 +-
> >  9 files changed, 175 insertions(+), 30 deletions(-)  create mode
> > 100644 drivers/media/platform/samsung/s5p-mfc/regs-mfc-v12.h
> >
> > diff --git a/drivers/media/platform/samsung/s5p-mfc/regs-mfc-v12.h
> > b/drivers/media/platform/samsung/s5p-mfc/regs-mfc-v12.h
> > new file mode 100644
> > index 000000000000..6c68a45082d0
> > --- /dev/null
> > +++ b/drivers/media/platform/samsung/s5p-mfc/regs-mfc-v12.h
> > =40=40 -0,0 +1,50 =40=40
> > +/* SPDX-License-Identifier: GPL-2.0-only */
> > +/*
> > + * Register definition file for Samsung MFC V12.x Interface (FIMV)
> > +driver
> > + *
> > + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
> > + *     http://www.samsung.com/
> > + */
> > +
> > +=23ifndef _REGS_MFC_V12_H
> > +=23define _REGS_MFC_V12_H
> > +
> > +=23include <linux/sizes.h>
> > +=23include =22regs-mfc-v10.h=22
> > +
> > +/* MFCv12 Context buffer sizes */
> > +=23define MFC_CTX_BUF_SIZE_V12		(30 * SZ_1K)
> > +=23define MFC_H264_DEC_CTX_BUF_SIZE_V12	(2 * SZ_1M)
> > +=23define MFC_OTHER_DEC_CTX_BUF_SIZE_V12	(30 * SZ_1K)
> > +=23define MFC_H264_ENC_CTX_BUF_SIZE_V12	(100 * SZ_1K)
> > +=23define MFC_HEVC_ENC_CTX_BUF_SIZE_V12	(40 * SZ_1K)
> > +=23define MFC_OTHER_ENC_CTX_BUF_SIZE_V12	(25 * SZ_1K)
> > +
> > +/* MFCv12 variant defines */
> > +=23define MAX_FW_SIZE_V12			(SZ_1M)
> > +=23define MAX_CPB_SIZE_V12		(7 * SZ_1M)
> > +=23define MFC_VERSION_V12			0xC0
> > +=23define MFC_NUM_PORTS_V12		1
> > +=23define S5P_FIMV_CODEC_VP9_ENC		27
> > +
> > +/* Encoder buffer size for MFCv12 */
> > +=23define ENC_V120_BASE_SIZE(x, y) =5C
> > +	(((x + 3) * (y + 3) * 8) =5C
> > +	+ (((y * 64) + 2304) * (x + 7) / 8))
> > +
> > +=23define ENC_V120_H264_ME_SIZE(x, y) =5C
> > +	ALIGN((ENC_V120_BASE_SIZE(x, y) =5C
> > +	+ (DIV_ROUND_UP(x * y, 64) * 32)), 256)
> > +
> > +=23define ENC_V120_MPEG4_ME_SIZE(x, y) =5C
> > +	ALIGN((ENC_V120_BASE_SIZE(x, y) =5C
> > +	+ (DIV_ROUND_UP(x * y, 128) * 16)), 256)
> > +
> > +=23define ENC_V120_VP8_ME_SIZE(x, y) =5C
> > +	ALIGN(ENC_V120_BASE_SIZE(x, y), 256)
> > +
> > +=23define ENC_V120_HEVC_ME_SIZE(x, y)     =5C
> > +	ALIGN((((x + 3) * (y + 3) * 32)       =5C
> > +	+ (((y * 128) + 2304) * (x + 3) / 4)), 256)
> > +
> > +=23endif /*_REGS_MFC_V12_H*/
> > diff --git a/drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c
> > b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c
> > index e30e54935d79..dee9ef017997 100644
> > --- a/drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c
> > +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c
> > =40=40 -790,6 +790,8 =40=40 static int s5p_mfc_open(struct file *file)
> >  	INIT_LIST_HEAD(&ctx->dst_queue);
> >  	ctx->src_queue_cnt =3D 0;
> >  	ctx->dst_queue_cnt =3D 0;
> > +	ctx->is_422 =3D 0;
> > +	ctx->is_10bit =3D 0;
> >  	/* Get context number */
> >  	ctx->num =3D 0;
> >  	while (dev->ctx=5Bctx->num=5D) =7B
> > =40=40 -1660,6 +1662,31 =40=40 static struct s5p_mfc_variant mfc_drvdat=
a_v10 =3D
> =7B
> >  	.fw_name=5B0=5D     =3D =22s5p-mfc-v10.fw=22,
> >  =7D;
> >
> > +static struct s5p_mfc_buf_size_v6 mfc_buf_size_v12 =3D =7B
> > +	.dev_ctx        =3D MFC_CTX_BUF_SIZE_V12,
> > +	.h264_dec_ctx   =3D MFC_H264_DEC_CTX_BUF_SIZE_V12,
> > +	.other_dec_ctx  =3D MFC_OTHER_DEC_CTX_BUF_SIZE_V12,
> > +	.h264_enc_ctx   =3D MFC_H264_ENC_CTX_BUF_SIZE_V12,
> > +	.hevc_enc_ctx   =3D MFC_HEVC_ENC_CTX_BUF_SIZE_V12,
> > +	.other_enc_ctx  =3D MFC_OTHER_ENC_CTX_BUF_SIZE_V12, =7D;
> > +
> > +static struct s5p_mfc_buf_size buf_size_v12 =3D =7B
> > +	.fw     =3D MAX_FW_SIZE_V12,
> > +	.cpb    =3D MAX_CPB_SIZE_V12,
> > +	.priv   =3D &mfc_buf_size_v12,
> > +=7D;
> > +
> > +static struct s5p_mfc_variant mfc_drvdata_v12 =3D =7B
> > +	.version        =3D MFC_VERSION_V12,
> > +	.version_bit    =3D MFC_V12_BIT,
> > +	.port_num       =3D MFC_NUM_PORTS_V12,
> > +	.buf_size       =3D &buf_size_v12,
> > +	.fw_name=5B0=5D     =3D =22s5p-mfc-v12.fw=22,
>=20
> Is this fw in the process of being added to linux-firmware? (Or perhaps i=
t is
> already there).
>=20
> Regards,
>=20
> 	Hans
>=20
Yes, we are in a process of upstreaming MFC v12 firmware bin to linux-firmw=
are.

Thanks for the review.

> > +	.clk_names	=3D =7B=22mfc=22=7D,
> > +	.num_clocks	=3D 1,
> > +=7D;
> > +
> >  static const struct of_device_id exynos_mfc_match=5B=5D =3D =7B
> >  	=7B
> >  		.compatible =3D =22samsung,mfc-v5=22,
> > =40=40 -1682,6 +1709,9 =40=40 static const struct of_device_id
> exynos_mfc_match=5B=5D =3D =7B
> >  	=7D, =7B
> >  		.compatible =3D =22samsung,mfc-v10=22,
> >  		.data =3D &mfc_drvdata_v10,
> > +	=7D, =7B
> > +		.compatible =3D =22tesla,fsd-mfc=22,
> > +		.data =3D &mfc_drvdata_v12,
> >  	=7D,
> >  	=7B=7D,
> >  =7D;
> > diff --git a/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_common.h
> > b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_common.h
> > index e6ec4a43b290..dd2e9f7704ab 100644
> > --- a/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_common.h
> > +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_common.h
> > =40=40 -19,7 +19,7 =40=40
> >  =23include <media/v4l2-ioctl.h>
> >  =23include <media/videobuf2-v4l2.h>
> >  =23include =22regs-mfc.h=22
> > -=23include =22regs-mfc-v10.h=22
> > +=23include =22regs-mfc-v12.h=22
> >
> >  =23define S5P_MFC_NAME		=22s5p-mfc=22
> >
> > =40=40 -720,6 +720,8 =40=40 struct s5p_mfc_ctx =7B
> >  	struct v4l2_ctrl *ctrls=5BMFC_MAX_CTRLS=5D;
> >  	struct v4l2_ctrl_handler ctrl_handler;
> >  	size_t scratch_buf_size;
> > +	int is_10bit;
> > +	int is_422;
> >  =7D;
> >
> >  /*
> > =40=40 -775,6 +777,7 =40=40 void s5p_mfc_cleanup_queue(struct list_head=
 *lh,
> struct vb2_queue *vq);
> >  =23define IS_MFCV7_PLUS(dev)	(dev->variant->version >=3D 0x70)
> >  =23define IS_MFCV8_PLUS(dev)	(dev->variant->version >=3D 0x80)
> >  =23define IS_MFCV10_PLUS(dev)	(dev->variant->version >=3D 0xA0)
> > +=23define IS_MFCV12(dev)		(dev->variant->version >=3D 0xC0)
> >  =23define FW_HAS_E_MIN_SCRATCH_BUF(dev) (IS_MFCV10_PLUS(dev))
> >
> >  =23define MFC_V5_BIT	BIT(0)
> > =40=40 -782,11 +785,15 =40=40 void s5p_mfc_cleanup_queue(struct list_he=
ad
> *lh, struct vb2_queue *vq);
> >  =23define MFC_V7_BIT	BIT(2)
> >  =23define MFC_V8_BIT	BIT(3)
> >  =23define MFC_V10_BIT	BIT(5)
> > +=23define MFC_V12_BIT	BIT(7)
> >
> >  =23define MFC_V5PLUS_BITS		(MFC_V5_BIT =7C MFC_V6_BIT =7C
> MFC_V7_BIT =7C =5C
> > -					MFC_V8_BIT =7C MFC_V10_BIT)
> > +					MFC_V8_BIT =7C MFC_V10_BIT =7C
> MFC_V12_BIT)
> >  =23define MFC_V6PLUS_BITS		(MFC_V6_BIT =7C MFC_V7_BIT =7C
> MFC_V8_BIT =7C =5C
> > -					MFC_V10_BIT)
> > -=23define MFC_V7PLUS_BITS		(MFC_V7_BIT =7C MFC_V8_BIT =7C
> MFC_V10_BIT)
> > +					MFC_V10_BIT =7C MFC_V12_BIT)
> > +=23define MFC_V7PLUS_BITS		(MFC_V7_BIT =7C MFC_V8_BIT =7C
> MFC_V10_BIT =7C =5C
> > +					MFC_V12_BIT)
> > +
> > +=23define MFC_V10PLUS_BITS	(MFC_V10_BIT =7C MFC_V12_BIT)
> >
> >  =23endif /* S5P_MFC_COMMON_H_ */
> > diff --git a/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.c
> > b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.c
> > index 54b54b2fa9b1..b49159142c53 100644
> > --- a/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.c
> > +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.c
> > =40=40 -130,7 +130,7 =40=40 int s5p_mfc_reset(struct s5p_mfc_dev *dev)
> >  			mfc_write(dev, 0, S5P_FIMV_REG_CLEAR_BEGIN_V6
> + (i*4));
> >
> >  		/* check bus reset control before reset */
> > -		if (dev->risc_on)
> > +		if (dev->risc_on && =21IS_MFCV12(dev))
> >  			if (s5p_mfc_bus_reset(dev))
> >  				return -EIO;
> >  		/* Reset
> > diff --git a/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.c
> > b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.c
> > index 268ffe4da53c..e219cbcd86d5 100644
> > --- a/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.c
> > +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.c
> > =40=40 -146,7 +146,7 =40=40 static struct s5p_mfc_fmt formats=5B=5D =3D=
 =7B
> >  		.codec_mode	=3D S5P_FIMV_CODEC_HEVC_DEC,
> >  		.type		=3D MFC_FMT_DEC,
> >  		.num_planes	=3D 1,
> > -		.versions	=3D MFC_V10_BIT,
> > +		.versions	=3D MFC_V10PLUS_BITS,
> >  		.flags		=3D V4L2_FMT_FLAG_DYN_RESOLUTION =7C
> >
> V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM,
> >  	=7D,
> > =40=40 -155,7 +155,7 =40=40 static struct s5p_mfc_fmt formats=5B=5D =3D=
 =7B
> >  		.codec_mode	=3D S5P_FIMV_CODEC_VP9_DEC,
> >  		.type		=3D MFC_FMT_DEC,
> >  		.num_planes	=3D 1,
> > -		.versions	=3D MFC_V10_BIT,
> > +		.versions	=3D MFC_V10PLUS_BITS,
> >  		.flags		=3D V4L2_FMT_FLAG_DYN_RESOLUTION,
> >  	=7D,
> >  =7D;
> > =40=40 -355,7 +355,7 =40=40 static int vidioc_g_fmt(struct file *file, =
void *priv,
> struct v4l2_format *f)
> >  		pix_mp->width =3D ctx->buf_width;
> >  		pix_mp->height =3D ctx->buf_height;
> >  		pix_mp->field =3D V4L2_FIELD_NONE;
> > -		pix_mp->num_planes =3D 2;
> > +		pix_mp->num_planes =3D ctx->dst_fmt->num_planes;
> >  		/* Set pixelformat to the format in which MFC
> >  		   outputs the decoded frame */
> >  		pix_mp->pixelformat =3D ctx->dst_fmt->fourcc; diff --git
> > a/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c
> > b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c
> > index f62703cebb77..e4d6e7c117b5 100644
> > --- a/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c
> > +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c
> > =40=40 -92,7 +92,7 =40=40 static struct s5p_mfc_fmt formats=5B=5D =3D =
=7B
> >  		.codec_mode	=3D S5P_FIMV_CODEC_HEVC_ENC,
> >  		.type		=3D MFC_FMT_ENC,
> >  		.num_planes	=3D 1,
> > -		.versions	=3D MFC_V10_BIT,
> > +		.versions	=3D MFC_V10PLUS_BITS,
> >  	=7D,
> >  =7D;
> >
> > =40=40 -1179,7 +1179,8 =40=40 static int enc_post_seq_start(struct s5p_=
mfc_ctx
> *ctx)
> >  		if (FW_HAS_E_MIN_SCRATCH_BUF(dev)) =7B
> >  			ctx->scratch_buf_size =3D s5p_mfc_hw_call(dev-
> >mfc_ops,
> >  					get_e_min_scratch_buf_size, dev);
> > -			ctx->bank1.size +=3D ctx->scratch_buf_size;
> > +			if (=21IS_MFCV12(dev))
> > +				ctx->bank1.size +=3D ctx->scratch_buf_size;
> >  		=7D
> >  		ctx->state =3D MFCINST_HEAD_PRODUCED;
> >  	=7D
> > diff --git a/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr.h
> > b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr.h
> > index b9831275f3ab..87ac56756a16 100644
> > --- a/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr.h
> > +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr.h
> > =40=40 -166,9 +166,9 =40=40 struct s5p_mfc_regs =7B
> >  	void __iomem *d_decoded_third_addr;/* only v7 */
> >  	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 */
> > +	void __iomem *d_min_scratch_buffer_size; /* v10 and v12 */
> > +	void __iomem *d_static_buffer_addr; /* v10 and v12 */
> > +	void __iomem *d_static_buffer_size; /* v10 and v12 */
> >
> >  	/* encoder registers */
> >  	void __iomem *e_frame_width;
> > =40=40 -268,7 +268,7 =40=40 struct s5p_mfc_regs =7B
> >  	void __iomem *e_vp8_hierarchical_qp_layer0;/* v7 and v8 */
> >  	void __iomem *e_vp8_hierarchical_qp_layer1;/* v7 and v8 */
> >  	void __iomem *e_vp8_hierarchical_qp_layer2;/* v7 and v8 */
> > -	void __iomem *e_min_scratch_buffer_size; /* v10 */
> > +	void __iomem *e_min_scratch_buffer_size; /* v10 and v12 */
> >  	void __iomem *e_num_t_layer; /* v10 */
> >  	void __iomem *e_hier_qp_layer0; /* v10 */
> >  	void __iomem *e_hier_bit_rate_layer0; /* v10 */ diff --git
> > a/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.c
> > b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.c
> > index 882166e4ac50..fb3f0718821d 100644
> > --- a/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.c
> > +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.c
> > =40=40 -60,12 +60,14 =40=40 static void
> > s5p_mfc_release_dec_desc_buffer_v6(struct s5p_mfc_ctx *ctx)  static
> > int s5p_mfc_alloc_codec_buffers_v6(struct s5p_mfc_ctx *ctx)  =7B
> >  	struct s5p_mfc_dev *dev =3D ctx->dev;
> > -	unsigned int mb_width, mb_height;
> > +	unsigned int mb_width, mb_height, width64, height32;
> >  	unsigned int lcu_width =3D 0, lcu_height =3D 0;
> >  	int ret;
> >
> >  	mb_width =3D MB_WIDTH(ctx->img_width);
> >  	mb_height =3D MB_HEIGHT(ctx->img_height);
> > +	width64 =3D ALIGN(ctx->img_width, 64);
> > +	height32 =3D ALIGN(ctx->img_height, 32);
> >
> >  	if (ctx->type =3D=3D MFCINST_DECODER) =7B
> >  		mfc_debug(2, =22Luma size:%d Chroma size:%d MV
> size:%d=5Cn=22, =40=40 -82,7
> > +84,44 =40=40 static int s5p_mfc_alloc_codec_buffers_v6(struct s5p_mfc_=
ctx
> *ctx)
> >  			ctx->tmv_buffer_size =3D
> S5P_FIMV_NUM_TMV_BUFFERS_V6 *
> >
> 	ALIGN(S5P_FIMV_TMV_BUFFER_SIZE_V6(mb_width, mb_height),
> >  			S5P_FIMV_TMV_BUFFER_ALIGN_V6);
> > -		if (IS_MFCV10_PLUS(dev)) =7B
> > +		if (IS_MFCV12(dev)) =7B
> > +			lcu_width =3D S5P_MFC_LCU_WIDTH(ctx->img_width);
> > +			lcu_height =3D S5P_MFC_LCU_HEIGHT(ctx-
> >img_height);
> > +			if (ctx->codec_mode =3D=3D
> S5P_FIMV_CODEC_HEVC_ENC &&
> > +								ctx->is_10bit)
> =7B
> > +				ctx->luma_dpb_size =3D
> > +					width64 * height32 +
> > +					ALIGN(DIV_ROUND_UP(lcu_width *
> 32, 4),
> > +							16) * height32 + 128;
> > +				if (ctx->is_422)
> > +					ctx->chroma_dpb_size =3D
> > +						ctx->luma_dpb_size;
> > +				else
> > +					ctx->chroma_dpb_size =3D
> > +						width64 * height32 / 2 +
> > +
> 	ALIGN(DIV_ROUND_UP(lcu_width *
> > +						32, 4), 16) * height32 / 2 +
> 128;
> > +			=7D else if (ctx->codec_mode =3D=3D
> S5P_FIMV_CODEC_VP9_ENC &&
> > +					ctx->is_10bit) =7B
> > +				ctx->luma_dpb_size =3D
> > +					ALIGN(ctx->img_width * 2, 128) *
> > +					height32 + 64;
> > +				ctx->chroma_dpb_size =3D
> > +					ALIGN(ctx->img_width * 2, 128) *
> > +					height32 / 2 + 64;
> > +			=7D else =7B
> > +				ctx->luma_dpb_size =3D
> > +					width64 * height32 + 64;
> > +				if (ctx->is_422)
> > +					ctx->chroma_dpb_size =3D
> > +						ctx->luma_dpb_size;
> > +				else
> > +					ctx->chroma_dpb_size =3D
> > +						width64 * height32 / 2 + 64;
> > +			=7D
> > +			ctx->luma_dpb_size =3D ALIGN(ctx->luma_dpb_size +
> 256, SZ_2K);
> > +			ctx->chroma_dpb_size =3D ALIGN(ctx-
> >chroma_dpb_size + 256, SZ_2K);
> > +		=7D else if (IS_MFCV10_PLUS(dev)) =7B
> >  			lcu_width =3D S5P_MFC_LCU_WIDTH(ctx->img_width);
> >  			lcu_height =3D S5P_MFC_LCU_HEIGHT(ctx-
> >img_height);
> >  			if (ctx->codec_mode =21=3D
> S5P_FIMV_CODEC_HEVC_ENC) =7B =40=40 -230,7
> > +269,11 =40=40 static int s5p_mfc_alloc_codec_buffers_v6(struct
> s5p_mfc_ctx *ctx)
> >  			DEC_VP9_STATIC_BUFFER_SIZE;
> >  		break;
> >  	case S5P_MFC_CODEC_H264_ENC:
> > -		if (IS_MFCV10_PLUS(dev)) =7B
> > +		if (IS_MFCV12(dev)) =7B
> > +			mfc_debug(2, =22Use min scratch buffer size=5Cn=22);
> > +			ctx->me_buffer_size =3D
> > +				ENC_V120_H264_ME_SIZE(mb_width,
> mb_height);
> > +		=7D else if (IS_MFCV10_PLUS(dev)) =7B
> >  			mfc_debug(2, =22Use min scratch buffer size=5Cn=22);
> >  			ctx->me_buffer_size =3D
> >  			ALIGN(ENC_V100_H264_ME_SIZE(mb_width,
> mb_height), 16); =40=40 -254,7
> > +297,11 =40=40 static int s5p_mfc_alloc_codec_buffers_v6(struct
> s5p_mfc_ctx *ctx)
> >  		break;
> >  	case S5P_MFC_CODEC_MPEG4_ENC:
> >  	case S5P_MFC_CODEC_H263_ENC:
> > -		if (IS_MFCV10_PLUS(dev)) =7B
> > +		if (IS_MFCV12(dev)) =7B
> > +			mfc_debug(2, =22Use min scratch buffer size=5Cn=22);
> > +			ctx->me_buffer_size =3D
> > +				ENC_V120_MPEG4_ME_SIZE(mb_width,
> mb_height);
> > +		=7D else if (IS_MFCV10_PLUS(dev)) =7B
> >  			mfc_debug(2, =22Use min scratch buffer size=5Cn=22);
> >  			ctx->me_buffer_size =3D
> >
> 	ALIGN(ENC_V100_MPEG4_ME_SIZE(mb_width,
> > =40=40 -273,7 +320,11 =40=40 static int s5p_mfc_alloc_codec_buffers_v6(=
struct
> s5p_mfc_ctx *ctx)
> >  		ctx->bank2.size =3D 0;
> >  		break;
> >  	case S5P_MFC_CODEC_VP8_ENC:
> > -		if (IS_MFCV10_PLUS(dev)) =7B
> > +		if (IS_MFCV12(dev)) =7B
> > +			mfc_debug(2, =22Use min scratch buffer size=5Cn=22);
> > +			ctx->me_buffer_size =3D
> > +				ENC_V120_VP8_ME_SIZE(mb_width,
> mb_height);
> > +		=7D else if (IS_MFCV10_PLUS(dev)) =7B
> >  			mfc_debug(2, =22Use min scratch buffer size=5Cn=22);
> >  			ctx->me_buffer_size =3D
> >  				ALIGN(ENC_V100_VP8_ME_SIZE(mb_width,
> mb_height), =40=40 -297,9
> > +348,14 =40=40 static int s5p_mfc_alloc_codec_buffers_v6(struct
> s5p_mfc_ctx *ctx)
> >  		ctx->bank2.size =3D 0;
> >  		break;
> >  	case S5P_MFC_CODEC_HEVC_ENC:
> > +		if (IS_MFCV12(dev))
> > +			ctx->me_buffer_size =3D
> > +				ENC_V120_HEVC_ME_SIZE(lcu_width,
> lcu_height);
> > +		else
> > +			ctx->me_buffer_size =3D
> > +				ALIGN(ENC_V100_HEVC_ME_SIZE(lcu_width,
> > +							lcu_height), 16);
> >  		mfc_debug(2, =22Use min scratch buffer size=5Cn=22);
> > -		ctx->me_buffer_size =3D
> > -			ALIGN(ENC_V100_HEVC_ME_SIZE(lcu_width,
> lcu_height), 16);
> >  		ctx->scratch_buf_size =3D ALIGN(ctx->scratch_buf_size, 256);
> >  		ctx->bank1.size =3D
> >  			ctx->scratch_buf_size + ctx->tmv_buffer_size + =40=40
> -452,12 +508,15
> > =40=40 static void s5p_mfc_dec_calc_dpb_size_v6(struct s5p_mfc_ctx *ctx=
)
> >
> >  	if (ctx->codec_mode =3D=3D S5P_MFC_CODEC_H264_DEC =7C=7C
> >  			ctx->codec_mode =3D=3D
> S5P_MFC_CODEC_H264_MVC_DEC) =7B
> > -		if (IS_MFCV10_PLUS(dev)) =7B
> > -			ctx->mv_size =3D S5P_MFC_DEC_MV_SIZE_V10(ctx-
> >img_width,
> > -					ctx->img_height);
> > +		if (IS_MFCV12(dev)) =7B
> > +			ctx->mv_size =3D S5P_MFC_DEC_MV_SIZE(ctx-
> >img_width,
> > +					ctx->img_height, 1024);
> > +		=7D else if (IS_MFCV10_PLUS(dev)) =7B
> > +			ctx->mv_size =3D S5P_MFC_DEC_MV_SIZE(ctx-
> >img_width,
> > +					ctx->img_height, 512);
> >  		=7D else =7B
> > -			ctx->mv_size =3D S5P_MFC_DEC_MV_SIZE_V6(ctx-
> >img_width,
> > -					ctx->img_height);
> > +			ctx->mv_size =3D S5P_MFC_DEC_MV_SIZE(ctx-
> >img_width,
> > +					ctx->img_height, 128);
> >  		=7D
> >  	=7D else if (ctx->codec_mode =3D=3D S5P_MFC_CODEC_HEVC_DEC) =7B
> >  		ctx->mv_size =3D s5p_mfc_dec_hevc_mv_size(ctx-
> >img_width,
> > diff --git a/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.h
> > b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.h
> > index e4dd03c5454c..30269f3e68e8 100644
> > --- a/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.h
> > +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.h
> > =40=40 -19,10 +19,8 =40=40
> >
> >  =23define MB_WIDTH(x_size)		DIV_ROUND_UP(x_size, 16)
> >  =23define MB_HEIGHT(y_size)		DIV_ROUND_UP(y_size, 16)
> > -=23define S5P_MFC_DEC_MV_SIZE_V6(x, y)	(MB_WIDTH(x) * =5C
> > -					(((MB_HEIGHT(y)+1)/2)*2) * 64 +
> 128)
> > -=23define S5P_MFC_DEC_MV_SIZE_V10(x, y)	(MB_WIDTH(x) * =5C
> > -					(((MB_HEIGHT(y)+1)/2)*2) * 64 +
> 512)
> > +=23define S5P_MFC_DEC_MV_SIZE(x, y, offset)	(MB_WIDTH(x) * =5C
> > +					(((MB_HEIGHT(y)+1)/2)*2) * 64 +
> offset)
> >  =23define S5P_MFC_LCU_WIDTH(x_size)	DIV_ROUND_UP(x_size, 32)
> >  =23define S5P_MFC_LCU_HEIGHT(y_size)	DIV_ROUND_UP(y_size, 32)
> >