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

Commit c9fcd51c authored by Smitha T Murthy's avatar Smitha T Murthy Committed by Mauro Carvalho Chehab
Browse files

media: s5p-mfc: Add support for HEVC decoder 



Add support for codec definition and corresponding buffer
requirements for HEVC decoder.

Signed-off-by: default avatarSmitha T Murthy <smitha.t@samsung.com>
Reviewed-by: default avatarAndrzej Hajda <a.hajda@samsung.com>
Acked-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 1c700fa7

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

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#define MFC_NUM_PORTS_V10	1



/* MFCv10 codec defines*/

#define S5P_FIMV_CODEC_HEVC_DEC		17

#define S5P_FIMV_CODEC_HEVC_ENC         26



/* Encoder buffer size for MFC v10.0 */

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

+3 −0
Original line number Diff line number Diff line
@@ -101,6 +101,9 @@ static int s5p_mfc_open_inst_cmd_v6(struct s5p_mfc_ctx *ctx) 
	case S5P_MFC_CODEC_VP8_DEC:

		codec_type = S5P_FIMV_CODEC_VP8_DEC_V6;

		break;

	case S5P_MFC_CODEC_HEVC_DEC:

		codec_type = S5P_FIMV_CODEC_HEVC_DEC;

		break;

	case S5P_MFC_CODEC_H264_ENC:

		codec_type = S5P_FIMV_CODEC_H264_ENC_V6;

		break;

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

+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ 
#define S5P_MFC_CODEC_H263_DEC		5

#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_H264_ENC		20

#define S5P_MFC_CODEC_H264_MVC_ENC	21

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

+7 −0
Original line number Diff line number Diff line
@@ -144,6 +144,13 @@ static struct s5p_mfc_fmt formats[] = { 
		.num_planes	= 1,

		.versions	= MFC_V6PLUS_BITS,

	},

	{

		.fourcc		= V4L2_PIX_FMT_HEVC,

		.codec_mode	= S5P_FIMV_CODEC_HEVC_DEC,

		.type		= MFC_FMT_DEC,

		.num_planes	= 1,

		.versions	= MFC_V10_BIT,

	},

};



#define NUM_FORMATS ARRAY_SIZE(formats)

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

+15 −2
Original line number Diff line number Diff line
@@ -220,6 +220,12 @@ static int s5p_mfc_alloc_codec_buffers_v6(struct s5p_mfc_ctx *ctx) 
				S5P_FIMV_SCRATCH_BUFFER_ALIGN_V6);

		ctx->bank1.size = ctx->scratch_buf_size;

		break;

	case S5P_MFC_CODEC_HEVC_DEC:

		mfc_debug(2, "Use min scratch buffer size\n");

		ctx->bank1.size =

			ctx->scratch_buf_size +

			(ctx->mv_count * ctx->mv_size);

		break;

	case S5P_MFC_CODEC_H264_ENC:

		if (IS_MFCV10(dev)) {

			mfc_debug(2, "Use min scratch buffer size\n");
@@ -321,6 +327,7 @@ static int s5p_mfc_alloc_instance_buffer_v6(struct s5p_mfc_ctx *ctx) 
	switch (ctx->codec_mode) {

	case S5P_MFC_CODEC_H264_DEC:

	case S5P_MFC_CODEC_H264_MVC_DEC:

	case S5P_MFC_CODEC_HEVC_DEC:

		ctx->ctx.size = buf_size->h264_dec_ctx;

		break;

	case S5P_MFC_CODEC_MPEG4_DEC:
@@ -434,6 +441,10 @@ static void s5p_mfc_dec_calc_dpb_size_v6(struct s5p_mfc_ctx *ctx) 
			ctx->mv_size = S5P_MFC_DEC_MV_SIZE_V6(ctx->img_width,

					ctx->img_height);

		}

	} else if (ctx->codec_mode == S5P_MFC_CODEC_HEVC_DEC) {

		ctx->mv_size = s5p_mfc_dec_hevc_mv_size(ctx->img_width,

				ctx->img_height);

		ctx->mv_size = ALIGN(ctx->mv_size, 32);

	} else {

		ctx->mv_size = 0;

	}
@@ -515,7 +526,8 @@ static int s5p_mfc_set_dec_frame_buffer_v6(struct s5p_mfc_ctx *ctx) 
	buf_size1 -= ctx->scratch_buf_size;



	if (ctx->codec_mode == S5P_FIMV_CODEC_H264_DEC ||

			ctx->codec_mode == S5P_FIMV_CODEC_H264_MVC_DEC){

			ctx->codec_mode == S5P_FIMV_CODEC_H264_MVC_DEC ||

			ctx->codec_mode == S5P_FIMV_CODEC_HEVC_DEC) {

		writel(ctx->mv_size, mfc_regs->d_mv_buffer_size);

		writel(ctx->mv_count, mfc_regs->d_num_mv);

	}
@@ -538,7 +550,8 @@ static int s5p_mfc_set_dec_frame_buffer_v6(struct s5p_mfc_ctx *ctx) 
				mfc_regs->d_second_plane_dpb + i * 4);

	}

	if (ctx->codec_mode == S5P_MFC_CODEC_H264_DEC ||

			ctx->codec_mode == S5P_MFC_CODEC_H264_MVC_DEC) {

			ctx->codec_mode == S5P_MFC_CODEC_H264_MVC_DEC ||

			ctx->codec_mode == S5P_MFC_CODEC_HEVC_DEC) {

		for (i = 0; i < ctx->mv_count; i++) {

			/* To test alignment */

			align_gap = buf_addr1;