* [PATCH v2 1/5] dt-bindings: media: Document STM32MP25 VDEC & VENC video codecs
2023-10-10 9:16 [PATCH v2 0/5] Add support for video hardware codec of STMicroelectronics STM32 SoC series Hugues Fruchet
@ 2023-10-10 9:16 ` Hugues Fruchet
2023-10-11 15:55 ` Conor Dooley
2023-10-12 12:39 ` Krzysztof Kozlowski
2023-10-10 9:16 ` [PATCH v2 2/5] media: hantro: add support for STM32MP25 VDEC Hugues Fruchet
` (3 subsequent siblings)
4 siblings, 2 replies; 9+ messages in thread
From: Hugues Fruchet @ 2023-10-10 9:16 UTC (permalink / raw)
To: Ezequiel Garcia, Philipp Zabel, Andrzej Pietrasiewicz,
Nicolas Dufresne, Sakari Ailus, Benjamin Gaignard,
Laurent Pinchart, Daniel Almeida, Benjamin Mugnier,
Heiko Stuebner, Mauro Carvalho Chehab, Hans Verkuil, linux-media,
Maxime Coquelin, Alexandre Torgue, linux-stm32, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, devicetree, linux-arm-kernel,
linux-kernel, linux-rockchip
Cc: Hugues Fruchet, Marco Felsch, Adam Ford
Add STM32MP25 VDEC video decoder & VENC video encoder bindings.
Signed-off-by: Hugues Fruchet <hugues.fruchet@foss.st.com>
---
.../media/st,stm32mp25-video-codec.yaml | 58 +++++++++++++++++++
1 file changed, 58 insertions(+)
create mode 100644 Documentation/devicetree/bindings/media/st,stm32mp25-video-codec.yaml
diff --git a/Documentation/devicetree/bindings/media/st,stm32mp25-video-codec.yaml b/Documentation/devicetree/bindings/media/st,stm32mp25-video-codec.yaml
new file mode 100644
index 000000000000..479566171568
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/st,stm32mp25-video-codec.yaml
@@ -0,0 +1,58 @@
+# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
+
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/media/st,stm32mp25-video-codec.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: STMicroelectronics STM32MP25 VDEC video decoder & VENC video encoder
+
+maintainers:
+ - Hugues Fruchet <hugues.fruchet@foss.st.com>
+
+description:
+ The STMicroelectronics STM32MP25 SOCs embeds a VDEC video hardware
+ decoder peripheral based on Verisilicon VC8000NanoD IP (former Hantro G1)
+ and a VENC video hardware encoder peripheral based on Verisilicon
+ VC8000NanoE IP (former Hantro H1).
+
+properties:
+ compatible:
+ items:
+ - enum:
+ - st,stm32mp25-vdec
+ - st,stm32mp25-venc
+
+ reg:
+ maxItems: 1
+
+ interrupts:
+ maxItems: 1
+
+ clocks:
+ maxItems: 1
+
+required:
+ - compatible
+ - reg
+ - interrupts
+ - clocks
+
+additionalProperties: false
+
+examples:
+ - |
+ #include <dt-bindings/interrupt-controller/arm-gic.h>
+ vdec: video-codec@580d0000 {
+ compatible = "st,stm32mp25-vdec";
+ reg = <0x580d0000 0x3c8>;
+ interrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&ck_icn_p_vdec>;
+ };
+ - |
+ venc: video-codec@580e0000 {
+ compatible = "st,stm32mp25-venc";
+ reg = <0x580e0000 0x800>;
+ interrupts = <GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&ck_icn_p_venc>;
+ };
--
2.25.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH v2 1/5] dt-bindings: media: Document STM32MP25 VDEC & VENC video codecs
2023-10-10 9:16 ` [PATCH v2 1/5] dt-bindings: media: Document STM32MP25 VDEC & VENC video codecs Hugues Fruchet
@ 2023-10-11 15:55 ` Conor Dooley
2023-10-12 7:54 ` Hugues FRUCHET
2023-10-12 12:39 ` Krzysztof Kozlowski
1 sibling, 1 reply; 9+ messages in thread
From: Conor Dooley @ 2023-10-11 15:55 UTC (permalink / raw)
To: Hugues Fruchet
Cc: Ezequiel Garcia, Philipp Zabel, Andrzej Pietrasiewicz,
Nicolas Dufresne, Sakari Ailus, Benjamin Gaignard,
Laurent Pinchart, Daniel Almeida, Benjamin Mugnier,
Heiko Stuebner, Mauro Carvalho Chehab, Hans Verkuil, linux-media,
Maxime Coquelin, Alexandre Torgue, linux-stm32, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, devicetree, linux-arm-kernel,
linux-kernel, linux-rockchip, Marco Felsch, Adam Ford
[-- Attachment #1: Type: text/plain, Size: 2581 bytes --]
Hey,
On Tue, Oct 10, 2023 at 11:16:39AM +0200, Hugues Fruchet wrote:
> Add STM32MP25 VDEC video decoder & VENC video encoder bindings.
>
> Signed-off-by: Hugues Fruchet <hugues.fruchet@foss.st.com>
> ---
> .../media/st,stm32mp25-video-codec.yaml | 58 +++++++++++++++++++
> 1 file changed, 58 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/media/st,stm32mp25-video-codec.yaml
>
> diff --git a/Documentation/devicetree/bindings/media/st,stm32mp25-video-codec.yaml b/Documentation/devicetree/bindings/media/st,stm32mp25-video-codec.yaml
> new file mode 100644
> index 000000000000..479566171568
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/media/st,stm32mp25-video-codec.yaml
> @@ -0,0 +1,58 @@
> +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
> +
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/media/st,stm32mp25-video-codec.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: STMicroelectronics STM32MP25 VDEC video decoder & VENC video encoder
> +
> +maintainers:
> + - Hugues Fruchet <hugues.fruchet@foss.st.com>
> +
> +description:
> + The STMicroelectronics STM32MP25 SOCs embeds a VDEC video hardware
> + decoder peripheral based on Verisilicon VC8000NanoD IP (former Hantro G1)
> + and a VENC video hardware encoder peripheral based on Verisilicon
> + VC8000NanoE IP (former Hantro H1).
> +
> +properties:
> + compatible:
> + items:
This "items:" is not needed, the enum on its own is enough.
> + - enum:
> + - st,stm32mp25-vdec
> + - st,stm32mp25-venc
> +
> + reg:
> + maxItems: 1
> +
> + interrupts:
> + maxItems: 1
> +
> + clocks:
> + maxItems: 1
> +
> +required:
> + - compatible
> + - reg
> + - interrupts
> + - clocks
> +
> +additionalProperties: false
> +
> +examples:
> + - |
> + #include <dt-bindings/interrupt-controller/arm-gic.h>
> + vdec: video-codec@580d0000 {
The node labels for both nodes here are not used & should be dropped.
Otherwise, this seems fine to me.
Cheers,
Conor.
> + compatible = "st,stm32mp25-vdec";
> + reg = <0x580d0000 0x3c8>;
> + interrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&ck_icn_p_vdec>;
> + };
> + - |
> + venc: video-codec@580e0000 {
> + compatible = "st,stm32mp25-venc";
> + reg = <0x580e0000 0x800>;
> + interrupts = <GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&ck_icn_p_venc>;
> + };
> --
> 2.25.1
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH v2 1/5] dt-bindings: media: Document STM32MP25 VDEC & VENC video codecs
2023-10-11 15:55 ` Conor Dooley
@ 2023-10-12 7:54 ` Hugues FRUCHET
0 siblings, 0 replies; 9+ messages in thread
From: Hugues FRUCHET @ 2023-10-12 7:54 UTC (permalink / raw)
To: Conor Dooley
Cc: Ezequiel Garcia, Philipp Zabel, Andrzej Pietrasiewicz,
Nicolas Dufresne, Sakari Ailus, Benjamin Gaignard,
Laurent Pinchart, Daniel Almeida, Benjamin Mugnier,
Heiko Stuebner, Mauro Carvalho Chehab, Hans Verkuil, linux-media,
Maxime Coquelin, Alexandre Torgue, linux-stm32, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, devicetree, linux-arm-kernel,
linux-kernel, linux-rockchip, Marco Felsch, Adam Ford
Hi Conor,
Will do all in v3, thanks !
On 10/11/23 17:55, Conor Dooley wrote:
> Hey,
>
> On Tue, Oct 10, 2023 at 11:16:39AM +0200, Hugues Fruchet wrote:
>> Add STM32MP25 VDEC video decoder & VENC video encoder bindings.
>>
>> Signed-off-by: Hugues Fruchet <hugues.fruchet@foss.st.com>
>> ---
>> .../media/st,stm32mp25-video-codec.yaml | 58 +++++++++++++++++++
>> 1 file changed, 58 insertions(+)
>> create mode 100644 Documentation/devicetree/bindings/media/st,stm32mp25-video-codec.yaml
>>
>> diff --git a/Documentation/devicetree/bindings/media/st,stm32mp25-video-codec.yaml b/Documentation/devicetree/bindings/media/st,stm32mp25-video-codec.yaml
>> new file mode 100644
>> index 000000000000..479566171568
>> --- /dev/null
>> +++ b/Documentation/devicetree/bindings/media/st,stm32mp25-video-codec.yaml
>> @@ -0,0 +1,58 @@
>> +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
>> +
>> +%YAML 1.2
>> +---
>> +$id: http://devicetree.org/schemas/media/st,stm32mp25-video-codec.yaml#
>> +$schema: http://devicetree.org/meta-schemas/core.yaml#
>> +
>> +title: STMicroelectronics STM32MP25 VDEC video decoder & VENC video encoder
>> +
>> +maintainers:
>> + - Hugues Fruchet <hugues.fruchet@foss.st.com>
>> +
>> +description:
>> + The STMicroelectronics STM32MP25 SOCs embeds a VDEC video hardware
>> + decoder peripheral based on Verisilicon VC8000NanoD IP (former Hantro G1)
>> + and a VENC video hardware encoder peripheral based on Verisilicon
>> + VC8000NanoE IP (former Hantro H1).
>> +
>> +properties:
>> + compatible:
>> + items:
>
> This "items:" is not needed, the enum on its own is enough.
>
>> + - enum:
>> + - st,stm32mp25-vdec
>> + - st,stm32mp25-venc
>> +
>> + reg:
>> + maxItems: 1
>> +
>> + interrupts:
>> + maxItems: 1
>> +
>> + clocks:
>> + maxItems: 1
>> +
>> +required:
>> + - compatible
>> + - reg
>> + - interrupts
>> + - clocks
>> +
>> +additionalProperties: false
>> +
>> +examples:
>> + - |
>> + #include <dt-bindings/interrupt-controller/arm-gic.h>
>> + vdec: video-codec@580d0000 {
>
> The node labels for both nodes here are not used & should be dropped.
>
> Otherwise, this seems fine to me.
>
> Cheers,
> Conor.
>
>> + compatible = "st,stm32mp25-vdec";
>> + reg = <0x580d0000 0x3c8>;
>> + interrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>;
>> + clocks = <&ck_icn_p_vdec>;
>> + };
>> + - |
>> + venc: video-codec@580e0000 {
>> + compatible = "st,stm32mp25-venc";
>> + reg = <0x580e0000 0x800>;
>> + interrupts = <GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>;
>> + clocks = <&ck_icn_p_venc>;
>> + };
>> --
>> 2.25.1
>>
BR,
Hugues.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 1/5] dt-bindings: media: Document STM32MP25 VDEC & VENC video codecs
2023-10-10 9:16 ` [PATCH v2 1/5] dt-bindings: media: Document STM32MP25 VDEC & VENC video codecs Hugues Fruchet
2023-10-11 15:55 ` Conor Dooley
@ 2023-10-12 12:39 ` Krzysztof Kozlowski
1 sibling, 0 replies; 9+ messages in thread
From: Krzysztof Kozlowski @ 2023-10-12 12:39 UTC (permalink / raw)
To: Hugues Fruchet, Ezequiel Garcia, Philipp Zabel,
Andrzej Pietrasiewicz, Nicolas Dufresne, Sakari Ailus,
Benjamin Gaignard, Laurent Pinchart, Daniel Almeida,
Benjamin Mugnier, Heiko Stuebner, Mauro Carvalho Chehab,
Hans Verkuil, linux-media, Maxime Coquelin, Alexandre Torgue,
linux-stm32, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
devicetree, linux-arm-kernel, linux-kernel, linux-rockchip
Cc: Marco Felsch, Adam Ford
On 10/10/2023 11:16, Hugues Fruchet wrote:
> Add STM32MP25 VDEC video decoder & VENC video encoder bindings.
>
> Signed-off-by: Hugues Fruchet <hugues.fruchet@foss.st.com>
> ---
> .../media/st,stm32mp25-video-codec.yaml | 58 +++++++++++++++++++
> 1 file changed, 58 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/media/st,stm32mp25-video-codec.yaml
>
> diff --git a/Documentation/devicetree/bindings/media/st,stm32mp25-video-codec.yaml b/Documentation/devicetree/bindings/media/st,stm32mp25-video-codec.yaml
> new file mode 100644
> index 000000000000..479566171568
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/media/st,stm32mp25-video-codec.yaml
> @@ -0,0 +1,58 @@
> +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
> +
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/media/st,stm32mp25-video-codec.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: STMicroelectronics STM32MP25 VDEC video decoder & VENC video encoder
> +
> +maintainers:
> + - Hugues Fruchet <hugues.fruchet@foss.st.com>
> +
> +description:
> + The STMicroelectronics STM32MP25 SOCs embeds a VDEC video hardware
> + decoder peripheral based on Verisilicon VC8000NanoD IP (former Hantro G1)
> + and a VENC video hardware encoder peripheral based on Verisilicon
> + VC8000NanoE IP (former Hantro H1).
> +
> +properties:
> + compatible:
> + items:
Drop "items", we keep simple enum in such case.
> + - enum:
> + - st,stm32mp25-vdec
> + - st,stm32mp25-venc
> +
> + reg:
> + maxItems: 1
> +
...
> +
> +examples:
> + - |
> + #include <dt-bindings/interrupt-controller/arm-gic.h>
> + vdec: video-codec@580d0000 {
> + compatible = "st,stm32mp25-vdec";
> + reg = <0x580d0000 0x3c8>;
> + interrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&ck_icn_p_vdec>;
> + };
> + - |
> + venc: video-codec@580e0000 {
> + compatible = "st,stm32mp25-venc";
> + reg = <0x580e0000 0x800>;
> + interrupts = <GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&ck_icn_p_venc>;
> + };
You can drop second example - it is the same as the first.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2 2/5] media: hantro: add support for STM32MP25 VDEC
2023-10-10 9:16 [PATCH v2 0/5] Add support for video hardware codec of STMicroelectronics STM32 SoC series Hugues Fruchet
2023-10-10 9:16 ` [PATCH v2 1/5] dt-bindings: media: Document STM32MP25 VDEC & VENC video codecs Hugues Fruchet
@ 2023-10-10 9:16 ` Hugues Fruchet
2023-10-10 9:16 ` [PATCH v2 3/5] media: hantro: add support for STM32MP25 VENC Hugues Fruchet
` (2 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: Hugues Fruchet @ 2023-10-10 9:16 UTC (permalink / raw)
To: Ezequiel Garcia, Philipp Zabel, Andrzej Pietrasiewicz,
Nicolas Dufresne, Sakari Ailus, Benjamin Gaignard,
Laurent Pinchart, Daniel Almeida, Benjamin Mugnier,
Heiko Stuebner, Mauro Carvalho Chehab, Hans Verkuil, linux-media,
Maxime Coquelin, Alexandre Torgue, linux-stm32, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, devicetree, linux-arm-kernel,
linux-kernel, linux-rockchip
Cc: Hugues Fruchet, Marco Felsch, Adam Ford
Add support for STM32MP25 VDEC video hardware decoder.
H264/VP8 decoding up to 4080x4080.
No post-processor support.
VDEC has its own reset/clock/irq.
Signed-off-by: Hugues Fruchet <hugues.fruchet@foss.st.com>
---
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 423fc85d79ee..8c6e0c66f0cd 100644
--- a/drivers/media/platform/verisilicon/hantro_drv.c
+++ b/drivers/media/platform/verisilicon/hantro_drv.c
@@ -732,6 +732,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..c9f107bc09db
--- /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@foss.st.com>
+ * 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 = 96,
+ .max_width = 4080,
+ .step_width = MB_DIM,
+ .min_height = 96,
+ .max_height = 4080,
+ .step_height = MB_DIM,
+ },
+ },
+ {
+ .fourcc = V4L2_PIX_FMT_VP8_FRAME,
+ .codec_mode = HANTRO_MODE_VP8_DEC,
+ .max_depth = 2,
+ .frmsize = {
+ .min_width = 96,
+ .max_width = 4080,
+ .step_width = MB_DIM,
+ .min_height = 96,
+ .max_height = 4080,
+ .step_height = MB_DIM,
+ },
+ },
+ {
+ .fourcc = V4L2_PIX_FMT_H264_SLICE,
+ .codec_mode = HANTRO_MODE_H264_DEC,
+ .max_depth = 2,
+ .frmsize = {
+ .min_width = 96,
+ .max_width = 4080,
+ .step_width = MB_DIM,
+ .min_height = 96,
+ .max_height = 4080,
+ .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),
+};
--
2.25.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH v2 3/5] media: hantro: add support for STM32MP25 VENC
2023-10-10 9:16 [PATCH v2 0/5] Add support for video hardware codec of STMicroelectronics STM32 SoC series Hugues Fruchet
2023-10-10 9:16 ` [PATCH v2 1/5] dt-bindings: media: Document STM32MP25 VDEC & VENC video codecs Hugues Fruchet
2023-10-10 9:16 ` [PATCH v2 2/5] media: hantro: add support for STM32MP25 VDEC Hugues Fruchet
@ 2023-10-10 9:16 ` Hugues Fruchet
2023-10-10 9:16 ` [PATCH v2 4/5] arm64: dts: st: add video decoder support to stm32mp255 Hugues Fruchet
2023-10-10 9:16 ` [PATCH v2 5/5] arm64: dts: st: add video encoder " Hugues Fruchet
4 siblings, 0 replies; 9+ messages in thread
From: Hugues Fruchet @ 2023-10-10 9:16 UTC (permalink / raw)
To: Ezequiel Garcia, Philipp Zabel, Andrzej Pietrasiewicz,
Nicolas Dufresne, Sakari Ailus, Benjamin Gaignard,
Laurent Pinchart, Daniel Almeida, Benjamin Mugnier,
Heiko Stuebner, Mauro Carvalho Chehab, Hans Verkuil, linux-media,
Maxime Coquelin, Alexandre Torgue, linux-stm32, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, devicetree, linux-arm-kernel,
linux-kernel, linux-rockchip
Cc: Hugues Fruchet, Marco Felsch, Adam Ford
Add support for STM32MP25 VENC video hardware encoder.
JPEG encoding up to 8176x8176.
VENC has its own reset/clock/irq.
Signed-off-by: Hugues Fruchet <hugues.fruchet@foss.st.com>
---
drivers/media/platform/verisilicon/Makefile | 3 +-
.../media/platform/verisilicon/hantro_drv.c | 1 +
.../media/platform/verisilicon/hantro_hw.h | 1 +
.../platform/verisilicon/stm32mp25_venc_hw.c | 147 ++++++++++++++++++
4 files changed, 151 insertions(+), 1 deletion(-)
create mode 100644 drivers/media/platform/verisilicon/stm32mp25_venc_hw.c
diff --git a/drivers/media/platform/verisilicon/Makefile b/drivers/media/platform/verisilicon/Makefile
index 5854e0f0dd32..3bf43fdbedc1 100644
--- a/drivers/media/platform/verisilicon/Makefile
+++ b/drivers/media/platform/verisilicon/Makefile
@@ -41,4 +41,5 @@ hantro-vpu-$(CONFIG_VIDEO_HANTRO_SUNXI) += \
sunxi_vpu_hw.o
hantro-vpu-$(CONFIG_VIDEO_HANTRO_STM32MP25) += \
- stm32mp25_vdec_hw.o
+ stm32mp25_vdec_hw.o \
+ stm32mp25_venc_hw.o
diff --git a/drivers/media/platform/verisilicon/hantro_drv.c b/drivers/media/platform/verisilicon/hantro_drv.c
index 8c6e0c66f0cd..3156aff50eb5 100644
--- a/drivers/media/platform/verisilicon/hantro_drv.c
+++ b/drivers/media/platform/verisilicon/hantro_drv.c
@@ -735,6 +735,7 @@ static const struct of_device_id of_hantro_match[] = {
#endif
#ifdef CONFIG_VIDEO_HANTRO_STM32MP25
{ .compatible = "st,stm32mp25-vdec", .data = &stm32mp25_vdec_variant, },
+ { .compatible = "st,stm32mp25-venc", .data = &stm32mp25_venc_variant, },
#endif
{ /* sentinel */ }
};
diff --git a/drivers/media/platform/verisilicon/hantro_hw.h b/drivers/media/platform/verisilicon/hantro_hw.h
index b7eccc1a96fc..70c72e9d11d5 100644
--- a/drivers/media/platform/verisilicon/hantro_hw.h
+++ b/drivers/media/platform/verisilicon/hantro_hw.h
@@ -407,6 +407,7 @@ 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_variant stm32mp25_venc_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_venc_hw.c b/drivers/media/platform/verisilicon/stm32mp25_venc_hw.c
new file mode 100644
index 000000000000..0aac33afcadc
--- /dev/null
+++ b/drivers/media/platform/verisilicon/stm32mp25_venc_hw.c
@@ -0,0 +1,147 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * STM32MP25 VENC video encoder driver
+ *
+ * Copyright (C) STMicroelectronics SA 2022
+ * Authors: Hugues Fruchet <hugues.fruchet@foss.st.com>
+ * for STMicroelectronics.
+ *
+ */
+
+#include <linux/clk.h>
+#include <linux/delay.h>
+#include <linux/reset.h>
+
+#include "hantro.h"
+#include "hantro_jpeg.h"
+#include "hantro_h1_regs.h"
+
+/*
+ * Supported formats.
+ */
+
+static const struct hantro_fmt stm32mp25_venc_fmts[] = {
+ {
+ .fourcc = V4L2_PIX_FMT_YUV420M,
+ .codec_mode = HANTRO_MODE_NONE,
+ .enc_fmt = ROCKCHIP_VPU_ENC_FMT_YUV420P,
+ .frmsize = {
+ .min_width = 96,
+ .max_width = 8176,
+ .step_width = MB_DIM,
+ .min_height = 32,
+ .max_height = 8176,
+ .step_height = MB_DIM,
+ },
+ },
+ {
+ .fourcc = V4L2_PIX_FMT_NV12M,
+ .codec_mode = HANTRO_MODE_NONE,
+ .enc_fmt = ROCKCHIP_VPU_ENC_FMT_YUV420SP,
+ .frmsize = {
+ .min_width = 96,
+ .max_width = 8176,
+ .step_width = MB_DIM,
+ .min_height = 32,
+ .max_height = 8176,
+ .step_height = MB_DIM,
+ },
+ },
+ {
+ .fourcc = V4L2_PIX_FMT_YUYV,
+ .codec_mode = HANTRO_MODE_NONE,
+ .enc_fmt = ROCKCHIP_VPU_ENC_FMT_YUYV422,
+ .frmsize = {
+ .min_width = 96,
+ .max_width = 8176,
+ .step_width = MB_DIM,
+ .min_height = 32,
+ .max_height = 8176,
+ .step_height = MB_DIM,
+ },
+ },
+ {
+ .fourcc = V4L2_PIX_FMT_UYVY,
+ .codec_mode = HANTRO_MODE_NONE,
+ .enc_fmt = ROCKCHIP_VPU_ENC_FMT_UYVY422,
+ .frmsize = {
+ .min_width = 96,
+ .max_width = 8176,
+ .step_width = MB_DIM,
+ .min_height = 32,
+ .max_height = 8176,
+ .step_height = MB_DIM,
+ },
+ },
+ {
+ .fourcc = V4L2_PIX_FMT_JPEG,
+ .codec_mode = HANTRO_MODE_JPEG_ENC,
+ .max_depth = 2,
+ .header_size = JPEG_HEADER_SIZE,
+ .frmsize = {
+ .min_width = 96,
+ .max_width = 8176,
+ .step_width = MB_DIM,
+ .min_height = 32,
+ .max_height = 8176,
+ .step_height = MB_DIM,
+ },
+ },
+};
+
+static irqreturn_t stm32mp25_venc_irq(int irq, void *dev_id)
+{
+ struct hantro_dev *vpu = dev_id;
+ enum vb2_buffer_state state;
+ u32 status;
+
+ status = vepu_read(vpu, H1_REG_INTERRUPT);
+ state = (status & H1_REG_INTERRUPT_FRAME_RDY) ?
+ VB2_BUF_STATE_DONE : VB2_BUF_STATE_ERROR;
+
+ vepu_write(vpu, H1_REG_INTERRUPT_BIT, H1_REG_INTERRUPT);
+
+ hantro_irq_done(vpu, state);
+
+ return IRQ_HANDLED;
+}
+
+static void stm32mp25_venc_reset(struct hantro_ctx *ctx)
+{
+}
+
+/*
+ * Supported codec ops.
+ */
+
+static const struct hantro_codec_ops stm32mp25_venc_codec_ops[] = {
+ [HANTRO_MODE_JPEG_ENC] = {
+ .run = hantro_h1_jpeg_enc_run,
+ .reset = stm32mp25_venc_reset,
+ .done = hantro_h1_jpeg_enc_done,
+ },
+};
+
+/*
+ * Variants.
+ */
+
+static const struct hantro_irq stm32mp25_venc_irqs[] = {
+ { "venc", stm32mp25_venc_irq },
+};
+
+static const char * const stm32mp25_venc_clk_names[] = {
+ "venc-clk"
+};
+
+const struct hantro_variant stm32mp25_venc_variant = {
+ .enc_fmts = stm32mp25_venc_fmts,
+ .num_enc_fmts = ARRAY_SIZE(stm32mp25_venc_fmts),
+ .codec = HANTRO_JPEG_ENCODER,
+ .codec_ops = stm32mp25_venc_codec_ops,
+ .irqs = stm32mp25_venc_irqs,
+ .num_irqs = ARRAY_SIZE(stm32mp25_venc_irqs),
+ .clk_names = stm32mp25_venc_clk_names,
+ .num_clocks = ARRAY_SIZE(stm32mp25_venc_clk_names)
+};
+
--
2.25.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH v2 4/5] arm64: dts: st: add video decoder support to stm32mp255
2023-10-10 9:16 [PATCH v2 0/5] Add support for video hardware codec of STMicroelectronics STM32 SoC series Hugues Fruchet
` (2 preceding siblings ...)
2023-10-10 9:16 ` [PATCH v2 3/5] media: hantro: add support for STM32MP25 VENC Hugues Fruchet
@ 2023-10-10 9:16 ` Hugues Fruchet
2023-10-10 9:16 ` [PATCH v2 5/5] arm64: dts: st: add video encoder " Hugues Fruchet
4 siblings, 0 replies; 9+ messages in thread
From: Hugues Fruchet @ 2023-10-10 9:16 UTC (permalink / raw)
To: Ezequiel Garcia, Philipp Zabel, Andrzej Pietrasiewicz,
Nicolas Dufresne, Sakari Ailus, Benjamin Gaignard,
Laurent Pinchart, Daniel Almeida, Benjamin Mugnier,
Heiko Stuebner, Mauro Carvalho Chehab, Hans Verkuil, linux-media,
Maxime Coquelin, Alexandre Torgue, linux-stm32, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, devicetree, linux-arm-kernel,
linux-kernel, linux-rockchip
Cc: Hugues Fruchet, Marco Felsch, Adam Ford
Add VDEC hardware video decoder support to STM32MP255.
Signed-off-by: Hugues Fruchet <hugues.fruchet@foss.st.com>
---
arch/arm64/boot/dts/st/stm32mp251.dtsi | 6 ++++++
arch/arm64/boot/dts/st/stm32mp255.dtsi | 10 ++++++++++
2 files changed, 16 insertions(+)
diff --git a/arch/arm64/boot/dts/st/stm32mp251.dtsi b/arch/arm64/boot/dts/st/stm32mp251.dtsi
index 5268a4321841..0ca421ede0ae 100644
--- a/arch/arm64/boot/dts/st/stm32mp251.dtsi
+++ b/arch/arm64/boot/dts/st/stm32mp251.dtsi
@@ -46,6 +46,12 @@ ck_icn_ls_mcu: ck-icn-ls-mcu {
compatible = "fixed-clock";
clock-frequency = <200000000>;
};
+
+ ck_icn_p_vdec: ck-icn-p-vdec {
+ #clock-cells = <0>;
+ compatible = "fixed-clock";
+ clock-frequency = <200000000>;
+ };
};
firmware {
diff --git a/arch/arm64/boot/dts/st/stm32mp255.dtsi b/arch/arm64/boot/dts/st/stm32mp255.dtsi
index e6fa596211f5..aea5096dac3c 100644
--- a/arch/arm64/boot/dts/st/stm32mp255.dtsi
+++ b/arch/arm64/boot/dts/st/stm32mp255.dtsi
@@ -6,4 +6,14 @@
#include "stm32mp253.dtsi"
/ {
+ soc@0 {
+ rifsc: rifsc-bus@42080000 {
+ vdec: vdec@480d0000 {
+ compatible = "st,stm32mp25-vdec";
+ reg = <0x480d0000 0x3c8>;
+ interrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&ck_icn_p_vdec>;
+ };
+ };
+ };
};
--
2.25.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH v2 5/5] arm64: dts: st: add video encoder support to stm32mp255
2023-10-10 9:16 [PATCH v2 0/5] Add support for video hardware codec of STMicroelectronics STM32 SoC series Hugues Fruchet
` (3 preceding siblings ...)
2023-10-10 9:16 ` [PATCH v2 4/5] arm64: dts: st: add video decoder support to stm32mp255 Hugues Fruchet
@ 2023-10-10 9:16 ` Hugues Fruchet
4 siblings, 0 replies; 9+ messages in thread
From: Hugues Fruchet @ 2023-10-10 9:16 UTC (permalink / raw)
To: Ezequiel Garcia, Philipp Zabel, Andrzej Pietrasiewicz,
Nicolas Dufresne, Sakari Ailus, Benjamin Gaignard,
Laurent Pinchart, Daniel Almeida, Benjamin Mugnier,
Heiko Stuebner, Mauro Carvalho Chehab, Hans Verkuil, linux-media,
Maxime Coquelin, Alexandre Torgue, linux-stm32, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, devicetree, linux-arm-kernel,
linux-kernel, linux-rockchip
Cc: Hugues Fruchet, Marco Felsch, Adam Ford
Add VENC hardware video encoder support to STM32MP255.
Signed-off-by: Hugues Fruchet <hugues.fruchet@foss.st.com>
---
arch/arm64/boot/dts/st/stm32mp251.dtsi | 6 ++++++
arch/arm64/boot/dts/st/stm32mp255.dtsi | 7 +++++++
2 files changed, 13 insertions(+)
diff --git a/arch/arm64/boot/dts/st/stm32mp251.dtsi b/arch/arm64/boot/dts/st/stm32mp251.dtsi
index 0ca421ede0ae..2aff746968f5 100644
--- a/arch/arm64/boot/dts/st/stm32mp251.dtsi
+++ b/arch/arm64/boot/dts/st/stm32mp251.dtsi
@@ -52,6 +52,12 @@ ck_icn_p_vdec: ck-icn-p-vdec {
compatible = "fixed-clock";
clock-frequency = <200000000>;
};
+
+ ck_icn_p_venc: ck-icn-p-venc {
+ #clock-cells = <0>;
+ compatible = "fixed-clock";
+ clock-frequency = <200000000>;
+ };
};
firmware {
diff --git a/arch/arm64/boot/dts/st/stm32mp255.dtsi b/arch/arm64/boot/dts/st/stm32mp255.dtsi
index aea5096dac3c..17f197c5b22b 100644
--- a/arch/arm64/boot/dts/st/stm32mp255.dtsi
+++ b/arch/arm64/boot/dts/st/stm32mp255.dtsi
@@ -14,6 +14,13 @@ vdec: vdec@480d0000 {
interrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&ck_icn_p_vdec>;
};
+
+ venc: venc@480e0000 {
+ compatible = "st,stm32mp25-venc";
+ reg = <0x480e0000 0x800>;
+ interrupts = <GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&ck_icn_ls_mcu>;
+ };
};
};
};
--
2.25.1
^ permalink raw reply related [flat|nested] 9+ messages in thread