Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e2b9deb2 authored by Kiran AVND's avatar Kiran AVND Committed by Mauro Carvalho Chehab
Browse files

[media] s5p-mfc: Core support to add v8 decoder 



This patch adds variant data and core support for
V8 decoder. This patch also adds the register definition
file for new firmware version v8 for MFC.

Signed-off-by: default avatarKiran AVND <avnd.kiran@samsung.com>
Signed-off-by: default avatarPawel Osciak <posciak@chromium.org>
Signed-off-by: default avatarArun Kumar K <arun.kk@samsung.com>
[k.debski@samsung.com: Change MFC version macro name to MFC_V8_BIT]
Signed-off-by: default avatarKamil Debski <k.debski@samsung.com>

Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 9aa5f008

Documentation/devicetree/bindings/media/s5p-mfc.txt

+2 −1
Original line number Diff line number Diff line
@@ -10,7 +10,8 @@ Required properties: 
  - compatible : value should be either one among the following

	(a) "samsung,mfc-v5" for MFC v5 present in Exynos4 SoCs

	(b) "samsung,mfc-v6" for MFC v6 present in Exynos5 SoCs

	(b) "samsung,mfc-v7" for MFC v7 present in Exynos5420 SoC

	(c) "samsung,mfc-v7" for MFC v7 present in Exynos5420 SoC

	(d) "samsung,mfc-v8" for MFC v8 present in Exynos5800 SoC



  - reg : Physical base address of the IP registers and length of memory

	  mapped region.

drivers/media/platform/s5p-mfc/regs-mfc-v8.h

0 → 100644
+94 −0
Original line number Diff line number Diff line 
/*

 * Register definition file for Samsung MFC V8.x Interface (FIMV) driver

 *

 * Copyright (c) 2014 Samsung Electronics Co., Ltd.

 *		http://www.samsung.com/

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#ifndef _REGS_MFC_V8_H

#define _REGS_MFC_V8_H



#include <linux/sizes.h>

#include "regs-mfc-v7.h"



/* Additional registers for v8 */

#define S5P_FIMV_D_MVC_NUM_VIEWS_V8		0xf104

#define S5P_FIMV_D_FIRST_PLANE_DPB_SIZE_V8	0xf144

#define S5P_FIMV_D_SECOND_PLANE_DPB_SIZE_V8	0xf148

#define S5P_FIMV_D_MV_BUFFER_SIZE_V8		0xf150



#define S5P_FIMV_D_FIRST_PLANE_DPB_STRIDE_SIZE_V8	0xf138

#define S5P_FIMV_D_SECOND_PLANE_DPB_STRIDE_SIZE_V8	0xf13c



#define S5P_FIMV_D_FIRST_PLANE_DPB_V8		0xf160

#define S5P_FIMV_D_SECOND_PLANE_DPB_V8		0xf260

#define S5P_FIMV_D_MV_BUFFER_V8			0xf460



#define S5P_FIMV_D_NUM_MV_V8			0xf134

#define S5P_FIMV_D_INIT_BUFFER_OPTIONS_V8	0xf154



#define S5P_FIMV_D_SCRATCH_BUFFER_ADDR_V8	0xf560

#define S5P_FIMV_D_SCRATCH_BUFFER_SIZE_V8	0xf564



#define S5P_FIMV_D_CPB_BUFFER_ADDR_V8		0xf5b0

#define S5P_FIMV_D_CPB_BUFFER_SIZE_V8		0xf5b4

#define S5P_FIMV_D_AVAILABLE_DPB_FLAG_LOWER_V8	0xf5bc

#define S5P_FIMV_D_CPB_BUFFER_OFFSET_V8		0xf5c0

#define S5P_FIMV_D_SLICE_IF_ENABLE_V8		0xf5c4

#define S5P_FIMV_D_STREAM_DATA_SIZE_V8		0xf5d0



/* Display information register */

#define S5P_FIMV_D_DISPLAY_FRAME_WIDTH_V8	0xf600

#define S5P_FIMV_D_DISPLAY_FRAME_HEIGHT_V8	0xf604



/* Display status */

#define S5P_FIMV_D_DISPLAY_STATUS_V8		0xf608



#define S5P_FIMV_D_DISPLAY_FIRST_PLANE_ADDR_V8	0xf60c

#define S5P_FIMV_D_DISPLAY_SECOND_PLANE_ADDR_V8	0xf610



#define S5P_FIMV_D_DISPLAY_FRAME_TYPE_V8	0xf618

#define S5P_FIMV_D_DISPLAY_CROP_INFO1_V8	0xf61c

#define S5P_FIMV_D_DISPLAY_CROP_INFO2_V8	0xf620

#define S5P_FIMV_D_DISPLAY_PICTURE_PROFILE_V8	0xf624



/* Decoded picture information register */

#define S5P_FIMV_D_DECODED_STATUS_V8		0xf644

#define S5P_FIMV_D_DECODED_FIRST_PLANE_ADDR_V8	0xf648

#define S5P_FIMV_D_DECODED_SECOND_PLANE_ADDR_V8	0xf64c

#define S5P_FIMV_D_DECODED_THIRD_PLANE_ADDR_V8	0xf650

#define S5P_FIMV_D_DECODED_FRAME_TYPE_V8	0xf654

#define S5P_FIMV_D_DECODED_NAL_SIZE_V8          0xf664



/* Returned value register for specific setting */

#define S5P_FIMV_D_RET_PICTURE_TAG_TOP_V8	0xf674

#define S5P_FIMV_D_RET_PICTURE_TAG_BOT_V8	0xf678

#define S5P_FIMV_D_MVC_VIEW_ID_V8		0xf6d8



/* SEI related information */

#define S5P_FIMV_D_FRAME_PACK_SEI_AVAIL_V8	0xf6dc



/* MFCv8 Context buffer sizes */

#define MFC_CTX_BUF_SIZE_V8		(30 * SZ_1K)	/*  30KB */

#define MFC_H264_DEC_CTX_BUF_SIZE_V8	(2 * SZ_1M)	/*  2MB */

#define MFC_OTHER_DEC_CTX_BUF_SIZE_V8	(20 * SZ_1K)	/*  20KB */



/* Buffer size defines */

#define S5P_FIMV_SCRATCH_BUF_SIZE_H264_DEC_V8(w, h)	(((w) * 704) + 2176)

#define S5P_FIMV_SCRATCH_BUF_SIZE_VP8_DEC_V8(w, h) \

		(((w) * 576 + (h) * 128)  + 4128)



/* BUffer alignment defines */

#define S5P_FIMV_D_ALIGN_PLANE_SIZE_V8	64



/* MFCv8 variant defines */

#define MAX_FW_SIZE_V8			(SZ_1M)		/* 1MB */

#define MAX_CPB_SIZE_V8			(3 * SZ_1M)	/* 3MB */

#define MFC_VERSION_V8			0x80

#define MFC_NUM_PORTS_V8		1



#endif /*_REGS_MFC_V8_H*/

drivers/media/platform/s5p-mfc/s5p_mfc.c

+31 −0
Original line number Diff line number Diff line
@@ -1400,6 +1400,31 @@ static struct s5p_mfc_variant mfc_drvdata_v7 = { 
	.fw_name        = "s5p-mfc-v7.fw",

};



struct s5p_mfc_buf_size_v6 mfc_buf_size_v8 = {

	.dev_ctx	= MFC_CTX_BUF_SIZE_V8,

	.h264_dec_ctx	= MFC_H264_DEC_CTX_BUF_SIZE_V8,

	.other_dec_ctx	= MFC_OTHER_DEC_CTX_BUF_SIZE_V8,

};



struct s5p_mfc_buf_size buf_size_v8 = {

	.fw	= MAX_FW_SIZE_V8,

	.cpb	= MAX_CPB_SIZE_V8,

	.priv	= &mfc_buf_size_v8,

};



struct s5p_mfc_buf_align mfc_buf_align_v8 = {

	.base = 0,

};



static struct s5p_mfc_variant mfc_drvdata_v8 = {

	.version	= MFC_VERSION_V8,

	.version_bit	= MFC_V8_BIT,

	.port_num	= MFC_NUM_PORTS_V8,

	.buf_size	= &buf_size_v8,

	.buf_align	= &mfc_buf_align_v8,

	.fw_name        = "s5p-mfc-v8.fw",

};



static struct platform_device_id mfc_driver_ids[] = {

	{

		.name = "s5p-mfc",
@@ -1413,6 +1438,9 @@ static struct platform_device_id mfc_driver_ids[] = { 
	}, {

		.name = "s5p-mfc-v7",

		.driver_data = (unsigned long)&mfc_drvdata_v7,

	}, {

		.name = "s5p-mfc-v8",

		.driver_data = (unsigned long)&mfc_drvdata_v8,

	},

	{},

};
@@ -1428,6 +1456,9 @@ static const struct of_device_id exynos_mfc_match[] = { 
	}, {

		.compatible = "samsung,mfc-v7",

		.data = &mfc_drvdata_v7,

	}, {

		.compatible = "samsung,mfc-v8",

		.data = &mfc_drvdata_v8,

	},

	{},

};

drivers/media/platform/s5p-mfc/s5p_mfc_common.h

+3 −2
Original line number Diff line number Diff line
@@ -23,8 +23,7 @@ 
#include <media/v4l2-ioctl.h>

#include <media/videobuf2-core.h>

#include "regs-mfc.h"

#include "regs-mfc-v6.h"

#include "regs-mfc-v7.h"

#include "regs-mfc-v8.h"



/* Definitions related to MFC memory */
@@ -704,10 +703,12 @@ void set_work_bit_irqsave(struct s5p_mfc_ctx *ctx); 
#define IS_TWOPORT(dev)		(dev->variant->port_num == 2 ? 1 : 0)

#define IS_MFCV6_PLUS(dev)	(dev->variant->version >= 0x60 ? 1 : 0)

#define IS_MFCV7_PLUS(dev)	(dev->variant->version >= 0x70 ? 1 : 0)

#define IS_MFCV8(dev)		(dev->variant->version >= 0x80 ? 1 : 0)



#define MFC_V5_BIT	BIT(0)

#define MFC_V6_BIT	BIT(1)

#define MFC_V7_BIT	BIT(2)

#define MFC_V8_BIT	BIT(3)





#endif /* S5P_MFC_COMMON_H_ */

drivers/media/platform/s5p-mfc/s5p_mfc_dec.c

+23 −13
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ static struct s5p_mfc_fmt formats[] = { 
		.codec_mode	= S5P_MFC_CODEC_NONE,

		.type		= MFC_FMT_RAW,

		.num_planes	= 2,

		.versions	= MFC_V6_BIT | MFC_V7_BIT,

		.versions	= MFC_V6_BIT | MFC_V7_BIT | MFC_V8_BIT,

	},

	{

		.name		= "4:2:0 2 Planes Y/CrCb",
@@ -63,7 +63,7 @@ static struct s5p_mfc_fmt formats[] = { 
		.codec_mode	= S5P_MFC_CODEC_NONE,

		.type		= MFC_FMT_RAW,

		.num_planes	= 2,

		.versions	= MFC_V6_BIT | MFC_V7_BIT,

		.versions	= MFC_V6_BIT | MFC_V7_BIT | MFC_V8_BIT,

	},

	{

		.name		= "H264 Encoded Stream",
@@ -71,7 +71,8 @@ static struct s5p_mfc_fmt formats[] = { 
		.codec_mode	= S5P_MFC_CODEC_H264_DEC,

		.type		= MFC_FMT_DEC,

		.num_planes	= 1,

		.versions	= MFC_V5_BIT | MFC_V6_BIT | MFC_V7_BIT,

		.versions	= MFC_V5_BIT | MFC_V6_BIT | MFC_V7_BIT |

								MFC_V8_BIT,

	},

	{

		.name		= "H264/MVC Encoded Stream",
@@ -79,7 +80,7 @@ static struct s5p_mfc_fmt formats[] = { 
		.codec_mode	= S5P_MFC_CODEC_H264_MVC_DEC,

		.type		= MFC_FMT_DEC,

		.num_planes	= 1,

		.versions	= MFC_V6_BIT | MFC_V7_BIT,

		.versions	= MFC_V6_BIT | MFC_V7_BIT | MFC_V8_BIT,

	},

	{

		.name		= "H263 Encoded Stream",
@@ -87,7 +88,8 @@ static struct s5p_mfc_fmt formats[] = { 
		.codec_mode	= S5P_MFC_CODEC_H263_DEC,

		.type		= MFC_FMT_DEC,

		.num_planes	= 1,

		.versions	= MFC_V5_BIT | MFC_V6_BIT | MFC_V7_BIT,

		.versions	= MFC_V5_BIT | MFC_V6_BIT | MFC_V7_BIT |

								MFC_V8_BIT,

	},

	{

		.name		= "MPEG1 Encoded Stream",
@@ -95,7 +97,8 @@ static struct s5p_mfc_fmt formats[] = { 
		.codec_mode	= S5P_MFC_CODEC_MPEG2_DEC,

		.type		= MFC_FMT_DEC,

		.num_planes	= 1,

		.versions	= MFC_V5_BIT | MFC_V6_BIT | MFC_V7_BIT,

		.versions	= MFC_V5_BIT | MFC_V6_BIT | MFC_V7_BIT |

								MFC_V8_BIT,

	},

	{

		.name		= "MPEG2 Encoded Stream",
@@ -103,7 +106,8 @@ static struct s5p_mfc_fmt formats[] = { 
		.codec_mode	= S5P_MFC_CODEC_MPEG2_DEC,

		.type		= MFC_FMT_DEC,

		.num_planes	= 1,

		.versions	= MFC_V5_BIT | MFC_V6_BIT | MFC_V7_BIT,

		.versions	= MFC_V5_BIT | MFC_V6_BIT | MFC_V7_BIT |

								MFC_V8_BIT,

	},

	{

		.name		= "MPEG4 Encoded Stream",
@@ -111,7 +115,8 @@ static struct s5p_mfc_fmt formats[] = { 
		.codec_mode	= S5P_MFC_CODEC_MPEG4_DEC,

		.type		= MFC_FMT_DEC,

		.num_planes	= 1,

		.versions	= MFC_V5_BIT | MFC_V6_BIT | MFC_V7_BIT,

		.versions	= MFC_V5_BIT | MFC_V6_BIT | MFC_V7_BIT |

								MFC_V8_BIT,

	},

	{

		.name		= "XviD Encoded Stream",
@@ -119,7 +124,8 @@ static struct s5p_mfc_fmt formats[] = { 
		.codec_mode	= S5P_MFC_CODEC_MPEG4_DEC,

		.type		= MFC_FMT_DEC,

		.num_planes	= 1,

		.versions	= MFC_V5_BIT | MFC_V6_BIT | MFC_V7_BIT,

		.versions	= MFC_V5_BIT | MFC_V6_BIT | MFC_V7_BIT |

								MFC_V8_BIT,

	},

	{

		.name		= "VC1 Encoded Stream",
@@ -127,7 +133,8 @@ static struct s5p_mfc_fmt formats[] = { 
		.codec_mode	= S5P_MFC_CODEC_VC1_DEC,

		.type		= MFC_FMT_DEC,

		.num_planes	= 1,

		.versions	= MFC_V5_BIT | MFC_V6_BIT | MFC_V7_BIT,

		.versions	= MFC_V5_BIT | MFC_V6_BIT | MFC_V7_BIT |

								MFC_V8_BIT,

	},

	{

		.name		= "VC1 RCV Encoded Stream",
@@ -135,7 +142,8 @@ static struct s5p_mfc_fmt formats[] = { 
		.codec_mode	= S5P_MFC_CODEC_VC1RCV_DEC,

		.type		= MFC_FMT_DEC,

		.num_planes	= 1,

		.versions	= MFC_V5_BIT | MFC_V6_BIT | MFC_V7_BIT,

		.versions	= MFC_V5_BIT | MFC_V6_BIT | MFC_V7_BIT |

								MFC_V8_BIT,

	},

	{

		.name		= "VP8 Encoded Stream",
@@ -143,7 +151,7 @@ static struct s5p_mfc_fmt formats[] = { 
		.codec_mode	= S5P_MFC_CODEC_VP8_DEC,

		.type		= MFC_FMT_DEC,

		.num_planes	= 1,

		.versions	= MFC_V6_BIT | MFC_V7_BIT,

		.versions	= MFC_V6_BIT | MFC_V7_BIT | MFC_V8_BIT,

	},

};
@@ -1200,7 +1208,9 @@ void s5p_mfc_dec_init(struct s5p_mfc_ctx *ctx) 
	struct v4l2_format f;

	f.fmt.pix_mp.pixelformat = V4L2_PIX_FMT_H264;

	ctx->src_fmt = find_format(&f, MFC_FMT_DEC);

	if (IS_MFCV6_PLUS(ctx->dev))

	if (IS_MFCV8(ctx->dev))

		f.fmt.pix_mp.pixelformat = V4L2_PIX_FMT_NV12M;

	else if (IS_MFCV6_PLUS(ctx->dev))

		f.fmt.pix_mp.pixelformat = V4L2_PIX_FMT_NV12MT_16X16;

	else

		f.fmt.pix_mp.pixelformat = V4L2_PIX_FMT_NV12MT;