Commit f40b567d authored by Yunfei Dong's avatar Yunfei Dong Committed by Mauro Carvalho Chehab
Browse files

media: mediatek: vcodec: Refactor supported vdec formats and framesizes 



Supported output and capture format types for mt8192 are different
with mt8183. Redefine parameters to store them.

Signed-off-by: default avatarYunfei Dong <yunfei.dong@mediatek.com>
Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Tested-by: default avatarNícolas F. R. A. Prado <nfraprado@collabora.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 7b182b8d

drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c

+4 −4
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ mtk_vdec_find_format(struct v4l2_format *f, 
	const struct mtk_video_fmt *fmt;

	unsigned int k;



	for (k = 0; k < dec_pdata->num_formats; k++) {

	for (k = 0; k < *dec_pdata->num_formats; k++) {

		fmt = &dec_pdata->vdec_formats[k];

		if (fmt->fourcc == f->fmt.pix_mp.pixelformat)

			return fmt;
@@ -520,7 +520,7 @@ static int vidioc_enum_framesizes(struct file *file, void *priv, 
	if (fsize->index != 0)

		return -EINVAL;



	for (i = 0; i < dec_pdata->num_framesizes; ++i) {

	for (i = 0; i < *dec_pdata->num_framesizes; ++i) {

		if (fsize->pixel_format != dec_pdata->vdec_framesizes[i].fourcc)

			continue;
@@ -552,7 +552,7 @@ static int vidioc_enum_fmt(struct v4l2_fmtdesc *f, void *priv, 
	const struct mtk_video_fmt *fmt;

	int i, j = 0;



	for (i = 0; i < dec_pdata->num_formats; i++) {

	for (i = 0; i < *dec_pdata->num_formats; i++) {

		if (output_queue &&

		    dec_pdata->vdec_formats[i].type != MTK_FMT_DEC)

			continue;
@@ -565,7 +565,7 @@ static int vidioc_enum_fmt(struct v4l2_fmtdesc *f, void *priv, 
		++j;

	}



	if (i == dec_pdata->num_formats)

	if (i == *dec_pdata->num_formats)

		return -EINVAL;



	fmt = &dec_pdata->vdec_formats[i];

drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateful.c

+8 −5
Original line number Diff line number Diff line
@@ -37,7 +37,9 @@ static const struct mtk_video_fmt mtk_video_formats[] = { 
	},

};



#define NUM_FORMATS ARRAY_SIZE(mtk_video_formats)

static const unsigned int num_supported_formats =

	ARRAY_SIZE(mtk_video_formats);



#define DEFAULT_OUT_FMT_IDX 0

#define DEFAULT_CAP_FMT_IDX 3
@@ -59,7 +61,8 @@ static const struct mtk_codec_framesizes mtk_vdec_framesizes[] = { 
	},

};



#define NUM_SUPPORTED_FRAMESIZE ARRAY_SIZE(mtk_vdec_framesizes)

static const unsigned int num_supported_framesize =

	ARRAY_SIZE(mtk_vdec_framesizes);



/*

 * This function tries to clean all display buffers, the buffers will return
@@ -230,7 +233,7 @@ static void mtk_vdec_update_fmt(struct mtk_vcodec_ctx *ctx, 
	unsigned int k;



	dst_q_data = &ctx->q_data[MTK_Q_DATA_DST];

	for (k = 0; k < NUM_FORMATS; k++) {

	for (k = 0; k < num_supported_formats; k++) {

		fmt = &mtk_video_formats[k];

		if (fmt->fourcc == pixelformat) {

			mtk_v4l2_debug(1, "Update cap fourcc(%d -> %d)",
@@ -612,11 +615,11 @@ const struct mtk_vcodec_dec_pdata mtk_vdec_8173_pdata = { 
	.ctrls_setup = mtk_vcodec_dec_ctrls_setup,

	.vdec_vb2_ops = &mtk_vdec_frame_vb2_ops,

	.vdec_formats = mtk_video_formats,

	.num_formats = NUM_FORMATS,

	.num_formats = &num_supported_formats,

	.default_out_fmt = &mtk_video_formats[DEFAULT_OUT_FMT_IDX],

	.default_cap_fmt = &mtk_video_formats[DEFAULT_CAP_FMT_IDX],

	.vdec_framesizes = mtk_vdec_framesizes,

	.num_framesizes = NUM_SUPPORTED_FRAMESIZE,

	.num_framesizes = &num_supported_framesize,

	.worker = mtk_vdec_worker,

	.flush_decoder = mtk_vdec_flush_decoder,

	.is_subdev_supported = false,

drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateless.c

+7 −6
Original line number Diff line number Diff line
@@ -94,7 +94,8 @@ static const struct mtk_video_fmt mtk_video_formats[] = { 
	},

};



#define NUM_FORMATS ARRAY_SIZE(mtk_video_formats)

static const unsigned int num_supported_formats = ARRAY_SIZE(mtk_video_formats);



#define DEFAULT_OUT_FMT_IDX    0

#define DEFAULT_CAP_FMT_IDX    1
@@ -106,7 +107,7 @@ static const struct mtk_codec_framesizes mtk_vdec_framesizes[] = { 
	},

};



#define NUM_SUPPORTED_FRAMESIZE ARRAY_SIZE(mtk_vdec_framesizes)

static const unsigned int num_supported_framesize = ARRAY_SIZE(mtk_vdec_framesizes);



static void mtk_vdec_stateless_cap_to_disp(struct mtk_vcodec_ctx *ctx, int error,

					   struct media_request *src_buf_req)
@@ -362,11 +363,11 @@ const struct mtk_vcodec_dec_pdata mtk_vdec_8183_pdata = { 
	.ctrls_setup = mtk_vcodec_dec_ctrls_setup,

	.vdec_vb2_ops = &mtk_vdec_request_vb2_ops,

	.vdec_formats = mtk_video_formats,

	.num_formats = NUM_FORMATS,

	.num_formats = &num_supported_formats,

	.default_out_fmt = &mtk_video_formats[DEFAULT_OUT_FMT_IDX],

	.default_cap_fmt = &mtk_video_formats[DEFAULT_CAP_FMT_IDX],

	.vdec_framesizes = mtk_vdec_framesizes,

	.num_framesizes = NUM_SUPPORTED_FRAMESIZE,

	.num_framesizes = &num_supported_framesize,

	.uses_stateless_api = true,

	.worker = mtk_vdec_worker,

	.flush_decoder = mtk_vdec_flush_decoder,
@@ -382,11 +383,11 @@ const struct mtk_vcodec_dec_pdata mtk_lat_sig_core_pdata = { 
	.ctrls_setup = mtk_vcodec_dec_ctrls_setup,

	.vdec_vb2_ops = &mtk_vdec_request_vb2_ops,

	.vdec_formats = mtk_video_formats,

	.num_formats = NUM_FORMATS,

	.num_formats = &num_supported_formats,

	.default_out_fmt = &mtk_video_formats[DEFAULT_OUT_FMT_IDX],

	.default_cap_fmt = &mtk_video_formats[DEFAULT_CAP_FMT_IDX],

	.vdec_framesizes = mtk_vdec_framesizes,

	.num_framesizes = NUM_SUPPORTED_FRAMESIZE,

	.num_framesizes = &num_supported_framesize,

	.uses_stateless_api = true,

	.worker = mtk_vdec_worker,

	.flush_decoder = mtk_vdec_flush_decoder,

drivers/media/platform/mediatek/vcodec/mtk_vcodec_drv.h

+11 −2
Original line number Diff line number Diff line
@@ -344,6 +344,15 @@ enum mtk_vdec_hw_arch { 
	MTK_VDEC_LAT_SINGLE_CORE,

};



/*

 * struct mtk_vdec_format_types - Structure used to get supported

 *		  format types according to decoder capability

 */

enum mtk_vdec_format_types {

	MTK_VDEC_FORMAT_MM21 = 0x20,

	MTK_VDEC_FORMAT_H264_SLICE = 0x100,

};



/**

 * struct mtk_vcodec_dec_pdata - compatible data for each IC

 * @init_vdec_params: init vdec params
@@ -380,12 +389,12 @@ struct mtk_vcodec_dec_pdata { 
	struct vb2_ops *vdec_vb2_ops;



	const struct mtk_video_fmt *vdec_formats;

	const int num_formats;

	const int *num_formats;

	const struct mtk_video_fmt *default_out_fmt;

	const struct mtk_video_fmt *default_cap_fmt;



	const struct mtk_codec_framesizes *vdec_framesizes;

	const int num_framesizes;

	const int *num_framesizes;



	enum mtk_vdec_hw_arch hw_arch;