Commit cf1abc50 authored by Adam Ford's avatar Adam Ford Committed by Mauro Carvalho Chehab
Browse files

media: hantro: Add support for i.MX8MM Hantro-G1 



The i.MX8MM has a Hantro G1 video decoder similar to the
imx8mq but lacks the post-processor present in the imx8mq.
Add support in the driver for it with the post-processing
removed.

Signed-off-by: default avatarAdam Ford <aford173@gmail.com>
Reviewed-by: default avatarEzequiel Garcia <ezequiel@vanguardiasur.com.ar>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 176f093c

drivers/staging/media/hantro/hantro_drv.c

+1 −0
Original line number Diff line number Diff line
@@ -630,6 +630,7 @@ static const struct of_device_id of_hantro_match[] = { 
	{ .compatible = "rockchip,rk3399-vpu", .data = &rk3399_vpu_variant, },

#endif

#ifdef CONFIG_VIDEO_HANTRO_IMX8M

	{ .compatible = "nxp,imx8mm-vpu-g1", .data = &imx8mm_vpu_g1_variant, },

	{ .compatible = "nxp,imx8mq-vpu", .data = &imx8mq_vpu_variant, },

	{ .compatible = "nxp,imx8mq-vpu-g1", .data = &imx8mq_vpu_g1_variant },

	{ .compatible = "nxp,imx8mq-vpu-g2", .data = &imx8mq_vpu_g2_variant },

drivers/staging/media/hantro/hantro_hw.h

+1 −0
Original line number Diff line number Diff line
@@ -290,6 +290,7 @@ enum hantro_enc_fmt { 
	ROCKCHIP_VPU_ENC_FMT_UYVY422 = 3,

};



extern const struct hantro_variant imx8mm_vpu_g1_variant;

extern const struct hantro_variant imx8mq_vpu_g1_variant;

extern const struct hantro_variant imx8mq_vpu_g2_variant;

extern const struct hantro_variant imx8mq_vpu_variant;

drivers/staging/media/hantro/imx8m_vpu_hw.c

+12 −0
Original line number Diff line number Diff line
@@ -327,3 +327,15 @@ const struct hantro_variant imx8mq_vpu_g2_variant = { 
	.clk_names = imx8mq_g2_clk_names,

	.num_clocks = ARRAY_SIZE(imx8mq_g2_clk_names),

};



const struct hantro_variant imx8mm_vpu_g1_variant = {

	.dec_fmts = imx8m_vpu_dec_fmts,

	.num_dec_fmts = ARRAY_SIZE(imx8m_vpu_dec_fmts),

	.codec = HANTRO_MPEG2_DECODER | HANTRO_VP8_DECODER |

		 HANTRO_H264_DECODER,

	.codec_ops = imx8mq_vpu_g1_codec_ops,

	.irqs = imx8mq_irqs,

	.num_irqs = ARRAY_SIZE(imx8mq_irqs),

	.clk_names = imx8mq_g1_clk_names,

	.num_clocks = ARRAY_SIZE(imx8mq_g1_clk_names),

};