Re: [PATCH v3 2/5] media: hantro: add support for STM32MP25 VDEC

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Le mercredi 20 décembre 2023 à 08:47 -0500, Nicolas Dufresne a écrit :
> Le mercredi 20 décembre 2023 à 09:46 +0100, Hugues Fruchet a écrit :
> > Add support for STM32MP25 VDEC video hardware decoder.
> > H264/VP8 decoding up to 4080x4080.

Missed that earlier, but the code sets 4096x2304, I believe you forgot to update
the description here. With that minor change, my R-b can stay of course.

> > No post-processor support.
> > VDEC has its own reset/clock/irq.
> > 
> > Signed-off-by: Hugues Fruchet <hugues.fruchet@xxxxxxxxxxx>
> 
> Reviewed-by: Nicolas Dufresne <nicolas.dufresne@xxxxxxxxxxxxx>
> 
> > ---
> >  drivers/media/platform/verisilicon/Kconfig    | 14 ++-
> >  drivers/media/platform/verisilicon/Makefile   |  3 +
> >  .../media/platform/verisilicon/hantro_drv.c   |  3 +
> >  .../media/platform/verisilicon/hantro_hw.h    |  1 +
> >  .../platform/verisilicon/stm32mp25_vdec_hw.c  | 92 +++++++++++++++++++
> >  5 files changed, 110 insertions(+), 3 deletions(-)
> >  create mode 100644 drivers/media/platform/verisilicon/stm32mp25_vdec_hw.c
> > 
> > diff --git a/drivers/media/platform/verisilicon/Kconfig b/drivers/media/platform/verisilicon/Kconfig
> > index e65b836b9d78..7642ff9cf96c 100644
> > --- a/drivers/media/platform/verisilicon/Kconfig
> > +++ b/drivers/media/platform/verisilicon/Kconfig
> > @@ -4,7 +4,7 @@ comment "Verisilicon media platform drivers"
> >  
> >  config VIDEO_HANTRO
> >  	tristate "Hantro VPU driver"
> > -	depends on ARCH_MXC || ARCH_ROCKCHIP || ARCH_AT91 || ARCH_SUNXI || COMPILE_TEST
> > +	depends on ARCH_MXC || ARCH_ROCKCHIP || ARCH_AT91 || ARCH_SUNXI || ARCH_STM32 || COMPILE_TEST
> >  	depends on V4L_MEM2MEM_DRIVERS
> >  	depends on VIDEO_DEV
> >  	select MEDIA_CONTROLLER
> > @@ -16,8 +16,8 @@ config VIDEO_HANTRO
> >  	select V4L2_VP9
> >  	help
> >  	  Support for the Hantro IP based Video Processing Units present on
> > -	  Rockchip and NXP i.MX8M SoCs, which accelerate video and image
> > -	  encoding and decoding.
> > +	  Rockchip, NXP i.MX8M and STM32MP25 SoCs, which accelerate video
> > +	  and image encoding and decoding.
> >  	  To compile this driver as a module, choose M here: the module
> >  	  will be called hantro-vpu.
> >  
> > @@ -52,3 +52,11 @@ config VIDEO_HANTRO_SUNXI
> >  	default y
> >  	help
> >  	  Enable support for H6 SoC.
> > +
> > +config VIDEO_HANTRO_STM32MP25
> > +	bool "Hantro STM32MP25 support"
> > +	depends on VIDEO_HANTRO
> > +	depends on ARCH_STM32 || COMPILE_TEST
> > +	default y
> > +	help
> > +	  Enable support for STM32MP25 SoCs.
> > diff --git a/drivers/media/platform/verisilicon/Makefile b/drivers/media/platform/verisilicon/Makefile
> > index 6ad2ef885920..5854e0f0dd32 100644
> > --- a/drivers/media/platform/verisilicon/Makefile
> > +++ b/drivers/media/platform/verisilicon/Makefile
> > @@ -39,3 +39,6 @@ hantro-vpu-$(CONFIG_VIDEO_HANTRO_ROCKCHIP) += \
> >  
> >  hantro-vpu-$(CONFIG_VIDEO_HANTRO_SUNXI) += \
> >  		sunxi_vpu_hw.o
> > +
> > +hantro-vpu-$(CONFIG_VIDEO_HANTRO_STM32MP25) += \
> > +		stm32mp25_vdec_hw.o
> > diff --git a/drivers/media/platform/verisilicon/hantro_drv.c b/drivers/media/platform/verisilicon/hantro_drv.c
> > index a9fa05ac56a9..2db27c333924 100644
> > --- a/drivers/media/platform/verisilicon/hantro_drv.c
> > +++ b/drivers/media/platform/verisilicon/hantro_drv.c
> > @@ -733,6 +733,9 @@ static const struct of_device_id of_hantro_match[] = {
> >  #endif
> >  #ifdef CONFIG_VIDEO_HANTRO_SUNXI
> >  	{ .compatible = "allwinner,sun50i-h6-vpu-g2", .data = &sunxi_vpu_variant, },
> > +#endif
> > +#ifdef CONFIG_VIDEO_HANTRO_STM32MP25
> > +	{ .compatible = "st,stm32mp25-vdec", .data = &stm32mp25_vdec_variant, },
> >  #endif
> >  	{ /* sentinel */ }
> >  };
> > diff --git a/drivers/media/platform/verisilicon/hantro_hw.h b/drivers/media/platform/verisilicon/hantro_hw.h
> > index 7f33f7b07ce4..b7eccc1a96fc 100644
> > --- a/drivers/media/platform/verisilicon/hantro_hw.h
> > +++ b/drivers/media/platform/verisilicon/hantro_hw.h
> > @@ -406,6 +406,7 @@ extern const struct hantro_variant rk3568_vpu_variant;
> >  extern const struct hantro_variant rk3588_vpu981_variant;
> >  extern const struct hantro_variant sama5d4_vdec_variant;
> >  extern const struct hantro_variant sunxi_vpu_variant;
> > +extern const struct hantro_variant stm32mp25_vdec_variant;
> >  
> >  extern const struct hantro_postproc_ops hantro_g1_postproc_ops;
> >  extern const struct hantro_postproc_ops hantro_g2_postproc_ops;
> > diff --git a/drivers/media/platform/verisilicon/stm32mp25_vdec_hw.c b/drivers/media/platform/verisilicon/stm32mp25_vdec_hw.c
> > new file mode 100644
> > index 000000000000..aa8b0f751390
> > --- /dev/null
> > +++ b/drivers/media/platform/verisilicon/stm32mp25_vdec_hw.c
> > @@ -0,0 +1,92 @@
> > +// SPDX-License-Identifier: GPL-2.0
> > +/*
> > + * STM32MP25 VDEC video decoder driver
> > + *
> > + * Copyright (C) STMicroelectronics SA 2022
> > + * Authors: Hugues Fruchet <hugues.fruchet@xxxxxxxxxxx>
> > + *          for STMicroelectronics.
> > + *
> > + */
> > +
> > +#include "hantro.h"
> > +
> > +/*
> > + * Supported formats.
> > + */
> > +
> > +static const struct hantro_fmt stm32mp25_vdec_fmts[] = {
> > +	{
> > +		.fourcc = V4L2_PIX_FMT_NV12,
> > +		.codec_mode = HANTRO_MODE_NONE,
> > +		.frmsize = {
> > +			.min_width = FMT_MIN_WIDTH,
> > +			.max_width = FMT_FHD_WIDTH,
> > +			.step_width = MB_DIM,
> > +			.min_height = FMT_MIN_HEIGHT,
> > +			.max_height = FMT_FHD_HEIGHT,
> > +			.step_height = MB_DIM,
> > +		},
> > +	},
> > +	{
> > +		.fourcc = V4L2_PIX_FMT_VP8_FRAME,
> > +		.codec_mode = HANTRO_MODE_VP8_DEC,
> > +		.max_depth = 2,
> > +		.frmsize = {
> > +			.min_width = FMT_MIN_WIDTH,
> > +			.max_width = FMT_FHD_WIDTH,
> > +			.step_width = MB_DIM,
> > +			.min_height = FMT_MIN_HEIGHT,
> > +			.max_height = FMT_FHD_HEIGHT,
> > +			.step_height = MB_DIM,
> > +		},
> > +	},
> > +	{
> > +		.fourcc = V4L2_PIX_FMT_H264_SLICE,
> > +		.codec_mode = HANTRO_MODE_H264_DEC,
> > +		.max_depth = 2,
> > +		.frmsize = {
> > +			.min_width = FMT_MIN_WIDTH,
> > +			.max_width = FMT_FHD_WIDTH,
> > +			.step_width = MB_DIM,
> > +			.min_height = FMT_MIN_HEIGHT,
> > +			.max_height = FMT_FHD_HEIGHT,
> > +			.step_height = MB_DIM,
> > +		},
> > +	},
> > +};
> > +
> > +/*
> > + * Supported codec ops.
> > + */
> > +
> > +static const struct hantro_codec_ops stm32mp25_vdec_codec_ops[] = {
> > +	[HANTRO_MODE_VP8_DEC] = {
> > +		.run = hantro_g1_vp8_dec_run,
> > +		.reset = hantro_g1_reset,
> > +		.init = hantro_vp8_dec_init,
> > +		.exit = hantro_vp8_dec_exit,
> > +	},
> > +	[HANTRO_MODE_H264_DEC] = {
> > +		.run = hantro_g1_h264_dec_run,
> > +		.reset = hantro_g1_reset,
> > +		.init = hantro_h264_dec_init,
> > +		.exit = hantro_h264_dec_exit,
> > +	},
> > +};
> > +
> > +static const struct hantro_irq stm32mp25_irqs[] = {
> > +	{ "vdec", hantro_g1_irq },
> > +};
> > +
> > +static const char * const stm32mp25_clk_names[] = { "vdec-clk" };
> > +
> > +const struct hantro_variant stm32mp25_vdec_variant = {
> > +	.dec_fmts = stm32mp25_vdec_fmts,
> > +	.num_dec_fmts = ARRAY_SIZE(stm32mp25_vdec_fmts),
> > +	.codec = HANTRO_VP8_DECODER | HANTRO_H264_DECODER,
> > +	.codec_ops = stm32mp25_vdec_codec_ops,
> > +	.irqs = stm32mp25_irqs,
> > +	.num_irqs = ARRAY_SIZE(stm32mp25_irqs),
> > +	.clk_names = stm32mp25_clk_names,
> > +	.num_clocks = ARRAY_SIZE(stm32mp25_clk_names),
> > +};
> 
> 






[Index of Archives]     [Device Tree Compilter]     [Device Tree Spec]     [Linux Driver Backports]     [Video for Linux]     [Linux USB Devel]     [Linux PCI Devel]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [XFree86]     [Yosemite Backpacking]


  Powered by Linux