media: meson: vdec: add g12a platform
Subsystems (5)
cover media: meson: vdec: add g12a platform
This patchset adds support for the current Amlogic Video Decoder driver for the Amlogic G12A & compatible SoCs.
The bindings are converted to YAML and dt-schemes to ease validation of the bindings and the Amlogic DT.
Then support is added for the currently supported MPEG1 & MPEG2 decoders and additional clock for upcoming HEVC/VP9 decoder support.
M2M Decoder compliance is handled in a separate patchset at [1].
# v4l2-compliance v4l2-compliance SHA: 7ead0e1856b89f2e19369af452bb03fd0cd16793, 64 bits
Compliance test for meson-vdec device /dev/video0:
Driver Info:
Driver name : meson-vdec Card type : Amlogic Video Decoder Bus info : platform:meson-vdec Driver version : 5.4.0 Capabilities : 0x84204000
Video Memory-to-Memory Multiplanar Streaming
Extended Pix Format
Device Capabilities
Device Caps : 0x04204000
Video Memory-to-Memory Multiplanar Streaming
Extended Pix Format
Detected Stateful Decoder
Required ioctls:
test VIDIOC_QUERYCAP: OK
Allow for multiple opens:
test second /dev/video0 open: OK
test VIDIOC_QUERYCAP: OK
test VIDIOC_G/S_PRIORITY: OK
test for unlimited opens: OK
Debug ioctls:
test VIDIOC_DBG_G/S_REGISTER: OK (Not Supported) test VIDIOC_LOG_STATUS: OK (Not Supported)
Input ioctls:
test VIDIOC_G/S_TUNER/ENUM_FREQ_BANDS: OK (Not Supported) test VIDIOC_G/S_FREQUENCY: OK (Not Supported) test VIDIOC_S_HW_FREQ_SEEK: OK (Not Supported) test VIDIOC_ENUMAUDIO: OK (Not Supported)
test VIDIOC_G/S/ENUMINPUT: OK (Not Supported) test VIDIOC_G/S_AUDIO: OK (Not Supported)
Inputs: 0 Audio Inputs: 0 Tuners: 0
Output ioctls:
test VIDIOC_G/S_MODULATOR: OK (Not Supported) test VIDIOC_G/S_FREQUENCY: OK (Not Supported) test VIDIOC_ENUMAUDOUT: OK (Not Supported) test VIDIOC_G/S/ENUMOUTPUT: OK (Not Supported) test VIDIOC_G/S_AUDOUT: OK (Not Supported)
Outputs: 0 Audio Outputs: 0 Modulators: 0
Input/Output configuration ioctls:
test VIDIOC_ENUM/G/S/QUERY_STD: OK (Not Supported) test VIDIOC_ENUM/G/S/QUERY_DV_TIMINGS: OK (Not Supported) test VIDIOC_DV_TIMINGS_CAP: OK (Not Supported) test VIDIOC_G/S_EDID: OK (Not Supported)
Control ioctls:
test VIDIOC_QUERY_EXT_CTRL/QUERYMENU: OK test VIDIOC_QUERYCTRL: OK
test VIDIOC_G/S_CTRL: OK
test VIDIOC_G/S/TRY_EXT_CTRLS: OK test VIDIOC_(UN)SUBSCRIBE_EVENT/DQEVENT: OK test VIDIOC_G/S_JPEGCOMP: OK (Not Supported) Standard Controls: 2 Private Controls: 0
Format ioctls:
test VIDIOC_ENUM_FMT/FRAMESIZES/FRAMEINTERVALS: OK test VIDIOC_G/S_PARM: OK (Not Supported) test VIDIOC_G_FBUF: OK (Not Supported) test VIDIOC_G_FMT: OK
test VIDIOC_TRY_FMT: OK
test VIDIOC_S_FMT: OK
test VIDIOC_G_SLICED_VBI_CAP: OK (Not Supported) test Cropping: OK (Not Supported)
test Composing: OK (Not Supported)
test Scaling: OK (Not Supported)
Codec ioctls:
test VIDIOC_(TRY_)ENCODER_CMD: OK (Not Supported) test VIDIOC_G_ENC_INDEX: OK (Not Supported) test VIDIOC_(TRY_)DECODER_CMD: OK
Buffer ioctls:
test VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: OK test VIDIOC_EXPBUF: OK
test Requests: OK (Not Supported)
Total for meson-vdec device /dev/video0: 44, Succeeded: 44, Failed: 0, Warnings: 0
Maxime Jourdan (1):
media: meson: vdec: add g12a platform
Neil Armstrong (3):
dt-bindings: media: amlogic,vdec: convert to yaml
dt-bindings: media: amlogic,gx-vdec: add bindings for G12A family
arm64: dts: meson-g12-common: add video decoder node
.../bindings/media/amlogic,gx-vdec.yaml | 142 ++++++++++++++++++ .../bindings/media/amlogic,vdec.txt | 72 --------- .../boot/dts/amlogic/meson-g12-common.dtsi | 23 +++ drivers/staging/media/meson/vdec/vdec.c | 13 +- drivers/staging/media/meson/vdec/vdec.h | 1 + .../staging/media/meson/vdec/vdec_platform.c | 30 ++++ .../staging/media/meson/vdec/vdec_platform.h | 2 + 7 files changed, 209 insertions(+), 74 deletions(-) create mode 100644 Documentation/devicetree/bindings/media/amlogic,gx-vdec.yaml delete mode 100644 Documentation/devicetree/bindings/media/amlogic,vdec.txt
Signature · 1 line
2.22.0
PATCH 1/4 dt-bindings: media: amlogic,vdec: convert to yaml
Now that we have the DT validation in place, let's convert the device tree bindings for the Amlogic Video Controller over to YAML schemas.
This yaml bindings will then be extended to support new SoCs.
--- .../bindings/media/amlogic,gx-vdec.yaml | 107 ++++++++++++++++++ .../bindings/media/amlogic,vdec.txt | 72 ------------ 2 files changed, 107 insertions(+), 72 deletions(-) create mode 100644 Documentation/devicetree/bindings/media/amlogic,gx-vdec.yaml delete mode 100644 Documentation/devicetree/bindings/media/amlogic,vdec.txt
Documentation/devicetree/bindings/media/amlogic,gx-vdec.yaml new file +107 -0
@@ -0,0 +1,107 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +# Copyright 2019 BayLibre, SAS +%YAML 1.2 +--- +$id: "http://devicetree.org/schemas/media/amlogic,gx-vdec.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#" + +title: Amlogic Video Decoder + +maintainers: + - Neil Armstrong <[email protected]> + - Maxime Jourdan <[email protected]> + +description: | + The video decoding IP lies within the DOS memory region, + except for the hardware bitstream parser that makes use of an undocumented + region. + + It makes use of the following blocks: + - ESPARSER is a bitstream parser that outputs to a VIFIFO. Further VDEC blocks + then feed from this VIFIFO. + - VDEC_1 can decode MPEG-1, MPEG-2, MPEG-4 part 2, MJPEG, H.263, H.264, VC-1. + - VDEC_HEVC can decode HEVC and VP9. + + Both VDEC_1 and VDEC_HEVC share the "vdec" IRQ and as such cannot run + concurrently. + +properties: + compatible: + items: + - enum: + - amlogic,gxbb-vdec # GXBB (S905) + - amlogic,gxl-vdec # GXL (S905X, S905D) + - amlogic,gxm-vdec # GXM (S912) + - const: amlogic,gx-vdec + + interrupts: + minItems: 2 + + interrupt-names: + items: + - const: vdec + - const: esparser + + reg: + minItems: 2 + + reg-names: + items: + - const: dos + - const: esparser + + resets: + maxItems: 1 + + reset-names: + items: + - const: esparser + + clocks: + minItems: 4 + + clock-names: + items: + - const: dos_parser + - const: dos + - const: vdec_1 + - const: vdec_hevc + + amlogic,ao-sysctrl: + description: should point to the AOBUS sysctrl node + allOf: + - $ref: /schemas/types.yaml#/definitions/phandle + + amlogic,canvas: + description: should point to a canvas provider node + allOf: + - $ref: /schemas/types.yaml#/definitions/phandle + +required: + - compatible + - reg + - reg-names + - interrupts + - interrupt-names + - clocks + - clock-names + - resets + - reset-names + - amlogic,ao-sysctrl + - amlogic,canvas + +examples: + - | + vdec: video-decoder@c8820000 { + compatible = "amlogic,gxl-vdec", "amlogic,gx-vdec"; + reg = <0xc8820000 0x10000>, <0xc110a580 0xe4>; + reg-names = "dos", "esparser"; + interrupts = <44>, <32>; + interrupt-names = "vdec", "esparser"; + clocks = <&clk_dos_parser> ,<&clk_dos>, <&clk_vdec_1>, <&clk_vdec_hevc>; + clock-names = "dos_parser", "dos", "vdec_1", "vdec_hevc"; + resets = <&reset_parser>; + reset-names = "esparser"; + amlogic,ao-sysctrl = <&sysctrl_AO>; + amlogic,canvas = <&canvas>; + };
Documentation/devicetree/bindings/media/amlogic,vdec.txt deleted +0 -72
72 lines not on this page · raw message
Signature · 1 line
2.22.0
Re: [PATCH 1/4] dt-bindings: media: amlogic,vdec: convert to yaml
Quoted 5 lines · Neil Armstrong
Now that we have the DT validation in place, let's convert the device tree bindings for the Amlogic Video Controller over to YAML schemas.
This yaml bindings will then be extended to support new SoCs.
Quoted 8 lines
Signed-off-by Neil Armstrong <[email protected]>--- .../bindings/media/amlogic,gx-vdec.yaml | 107 ++++++++++++++++++ .../bindings/media/amlogic,vdec.txt | 72 ------------ 2 files changed, 107 insertions(+), 72 deletions(-) create mode 100644 Documentation/devicetree/bindings/media/amlogic,gx-vdec.yaml delete mode 100644 Documentation/devicetree/bindings/media/amlogic,vdec.txt
PATCH 2/4 dt-bindings: media: amlogic,gx-vdec: add bindings for G12A family
In reply to Neil ArmstrongAdd bindings to support the Amlogic Video Decoder on the Amlogic G12A family.
For the G12A family, a supplementary clock is needed to operate the HEVC/VP9 decoder.
--- .../bindings/media/amlogic,gx-vdec.yaml | 57 +++++++++++++++---- 1 file changed, 46 insertions(+), 11 deletions(-)
Documentation/devicetree/bindings/media/amlogic,gx-vdec.yaml +46 -11
@@ -27,12 +27,15 @@ description: | properties: compatible: - items: + oneOf: + - items: + - enum: + - amlogic,gxbb-vdec # GXBB (S905) + - amlogic,gxl-vdec # GXL (S905X, S905D) + - amlogic,gxm-vdec # GXM (S912) + - const: amlogic,gx-vdec - enum: - - amlogic,gxbb-vdec # GXBB (S905) - - amlogic,gxl-vdec # GXL (S905X, S905D) - - amlogic,gxm-vdec # GXM (S912) - - const: amlogic,gx-vdec + - amlogic,g12a-vdec # G12A (S905X2, S905D2) interrupts: minItems: 2
@@ -59,13 +62,9 @@ properties: clocks: minItems: 4 + maxItems: 5 - clock-names: - items: - - const: dos_parser - - const: dos - - const: vdec_1 - - const: vdec_hevc + clock-names: true amlogic,ao-sysctrl: description: should point to the AOBUS sysctrl node
@@ -77,6 +76,42 @@ properties: allOf: - $ref: /schemas/types.yaml#/definitions/phandle +allOf: + - if: + properties: + compatible: + contains: + enum: + - amlogic,gx-vdec + + then: + properties: + clock-names: + minItems: 4 + items: + - const: dos_parser + - const: dos + - const: vdec_1 + - const: vdec_hevc + + - if: + properties: + compatible: + contains: + enum: + - amlogic,g12a-vdec + + then: + properties: + clock-names: + minItems: 5 + items: + - const: dos_parser + - const: dos + - const: vdec_1 + - const: vdec_hevc + - const: vdec_hevcf + required: - compatible - reg
Signature · 1 line
2.22.0
Rob Herring
maintainerRe: [PATCH 2/4] dt-bindings: media: amlogic,gx-vdec: add bindings for G12A family
Quoted 38 lines · Neil Armstrong
Add bindings to support the Amlogic Video Decoder on the Amlogic G12A family.
For the G12A family, a supplementary clock is needed to operate the HEVC/VP9 decoder.
Signed-off-by Neil Armstrong <[email protected]>--- .../bindings/media/amlogic,gx-vdec.yaml | 57 +++++++++++++++---- 1 file changed, 46 insertions(+), 11 deletions(-)Documentation/devicetree/bindings/media/amlogic,gx-vdec.yaml +8
-5@@ -27,12 +27,15 @@ description: | properties: compatible: - items: + oneOf: + - items: + - enum: + - amlogic,gxbb-vdec # GXBB (S905) + - amlogic,gxl-vdec # GXL (S905X, S905D) + - amlogic,gxm-vdec # GXM (S912) + - const: amlogic,gx-vdec - enum: - - amlogic,gxbb-vdec # GXBB (S905) - - amlogic,gxl-vdec # GXL (S905X, S905D) - - amlogic,gxm-vdec # GXM (S912) - - const: amlogic,gx-vdec + - amlogic,g12a-vdec # G12A (S905X2, S905D2) interrupts: minItems: 2@@ -59,13 +62,9 @@ properties:
Documentation/devicetree/bindings/media/amlogic,gx-vdec.yaml properties: · line 68
Quoted 10 lines
Documentation/devicetree/bindings/media/amlogic,gx-vdec.yaml +1
-6clocks: minItems: 4 + maxItems: 5 - clock-names: - items: - - const: dos_parser - - const: dos - - const: vdec_1 - - const: vdec_hevc
You can leave this here and add the 5th clock along with { minItems: 4,
maxItems: 5 }.
Then the 'if' schema just needs a 'maxItems: 4'.
Quoted 50 lines
Documentation/devicetree/bindings/media/amlogic,gx-vdec.yaml +37
-0+ clock-names: true amlogic,ao-sysctrl: description: should point to the AOBUS sysctrl node@@ -77,6 +76,42 @@ properties: allOf: - $ref: /schemas/types.yaml#/definitions/phandle +allOf: + - if: + properties: + compatible: + contains: + enum: + - amlogic,gx-vdec + + then: + properties: + clock-names: + minItems: 4 + items: + - const: dos_parser + - const: dos + - const: vdec_1 + - const: vdec_hevc + + - if: + properties: + compatible: + contains: + enum: + - amlogic,g12a-vdec + + then: + properties: + clock-names: + minItems: 5 + items: + - const: dos_parser + - const: dos + - const: vdec_1 + - const: vdec_hevc + - const: vdec_hevcf + required: - compatible - regSignature · 1 line
2.22.0
PATCH 3/4 media: meson: vdec: add g12a platform
In reply to Neil ArmstrongFrom: Maxime Jourdan <[email protected]>
Add support for the G12A platform by:
- adding the G12A codec support, here MPEG1 & MPEG2
- getting the new hevcf clock for the upcoming HEVC/VP9 decoding support
--- drivers/staging/media/meson/vdec/vdec.c | 13 ++++++-- drivers/staging/media/meson/vdec/vdec.h | 1 + .../staging/media/meson/vdec/vdec_platform.c | 30 +++++++++++++++++++ .../staging/media/meson/vdec/vdec_platform.h | 2 ++ 4 files changed, 44 insertions(+), 2 deletions(-)
drivers/staging/media/meson/vdec/vdec.c +11 -2
@@ -956,6 +956,8 @@ static const struct of_device_id vdec_dt_match[] = { .data = &vdec_platform_gxm }, { .compatible = "amlogic,gxl-vdec", .data = &vdec_platform_gxl }, + { .compatible = "amlogic,g12a-vdec", + .data = &vdec_platform_g12a }, {} };MODULE_DEVICE_TABLE (of, vdec_dt_match);
@@ -1003,6 +1005,15 @@ static int vdec_probe(struct platform_device *pdev)if (IS_ERR (core->canvas))return PTR_ERR (core->canvas); + of_id =of_match_node (vdec_dt_match, dev->of_node); + core->platform = of_id->data; + +if (core->platform->revision ==VDEC_REVISION_G12A ) { + core->vdec_hevcf_clk =devm_clk_get (dev,"vdec_hevcf" ); +if (IS_ERR (core->vdec_hevcf_clk)) +return -EPROBE_DEFER ; + } + core->dos_parser_clk =devm_clk_get (dev,"dos_parser" );if (IS_ERR (core->dos_parser_clk))return -EPROBE_DEFER ;
@@ -1045,8 +1056,6 @@ static int vdec_probe(struct platform_device *pdev) goto err_vdev_release; } - of_id =of_match_node (vdec_dt_match, dev->of_node); - core->platform = of_id->data; core->vdev_dec = vdev; core->dev_dec = dev;mutex_init (&core->lock);
drivers/staging/media/meson/vdec/vdec.h +1 -0
@@ -74,6 +74,7 @@ struct amvdec_core {struct clk *dos_clk;struct clk *vdec_1_clk;struct clk *vdec_hevc_clk; +struct clk *vdec_hevcf_clk;struct reset_control *esparser_reset;
drivers/staging/media/meson/vdec/vdec_platform.c +30 -0
@@ -82,6 +82,30 @@ static const struct amvdec_format vdec_formats_gxm[] = { }, }; +static const struct amvdec_format vdec_formats_g12a[] = { + { + .pixfmt =V4L2_PIX_FMT_MPEG1 , + .min_buffers =8 , + .max_buffers =8 , + .max_width =1920 , + .max_height =1080 , + .vdec_ops = &vdec_1_ops, + .codec_ops = &codec_mpeg12_ops, + .firmware_path ="meson/vdec/gxl_mpeg12.bin" , + .pixfmts_cap = {V4L2_PIX_FMT_NV12M ,V4L2_PIX_FMT_YUV420M ,0 }, + }, { + .pixfmt =V4L2_PIX_FMT_MPEG2 , + .min_buffers =8 , + .max_buffers =8 , + .max_width =1920 , + .max_height =1080 , + .vdec_ops = &vdec_1_ops, + .codec_ops = &codec_mpeg12_ops, + .firmware_path ="meson/vdec/gxl_mpeg12.bin" , + .pixfmts_cap = {V4L2_PIX_FMT_NV12M ,V4L2_PIX_FMT_YUV420M ,0 }, + }, +}; +const struct vdec_platform vdec_platform_gxbb = { .formats = vdec_formats_gxbb, .num_formats =ARRAY_SIZE (vdec_formats_gxbb),
@@ -99,3 +123,9 @@ const struct vdec_platform vdec_platform_gxm = { .num_formats = ARRAY_SIZE(vdec_formats_gxm), .revision = VDEC_REVISION_GXM, }; + +const struct vdec_platform vdec_platform_g12a = { + .formats = vdec_formats_g12a, + .num_formats =ARRAY_SIZE (vdec_formats_g12a), + .revision =VDEC_REVISION_G12A , +};
drivers/staging/media/meson/vdec/vdec_platform.h +2 -0
@@ -15,6 +15,7 @@ enum vdec_revision {VDEC_REVISION_GXBB ,VDEC_REVISION_GXL ,VDEC_REVISION_GXM , + VDEC_REVISION_G12A, }; struct vdec_platform {
@@ -26,5 +27,6 @@ struct vdec_platform {extern const struct vdec_platform vdec_platform_gxbb;extern const struct vdec_platform vdec_platform_gxm;extern const struct vdec_platform vdec_platform_gxl; +extern const struct vdec_platform vdec_platform_g12a;#endif
Signature · 1 line
2.22.0
PATCH 4/4 arm64: dts: meson-g12-common: add video decoder node
In reply to Neil ArmstrongFrom: Maxime Jourdan <[email protected]>
Add the video decoder node for the Amlogic G12A and compatible SoC.
--- .../boot/dts/amlogic/meson-g12-common.dtsi | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+)
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +23 -0
@@ -2152,6 +2152,29 @@ }; }; + vdec: video-decoder@ff620000 { + compatible = "amlogic,g12a-vdec"; + reg = <0x0 0xff620000 0x0 0x10000>, + <0x0 0xffd0e180 0x0 0xe4>; + reg-names = "dos", "esparser"; + interrupts = <GIC_SPI 44 IRQ_TYPE_EDGE_RISING>, + <GIC_SPI 32 IRQ_TYPE_EDGE_RISING>; + interrupt-names = "vdec", "esparser"; + + amlogic,ao-sysctrl = <&rti>; + amlogic,canvas = <&canvas>; + + clocks = <&clkc CLKID_PARSER>, + <&clkc CLKID_DOS>, + <&clkc CLKID_VDEC_1>, + <&clkc CLKID_VDEC_HEVC>, + <&clkc CLKID_VDEC_HEVCF>; + clock-names = "dos_parser", "dos", "vdec_1", + "vdec_hevc", "vdec_hevcf"; + resets = <&reset RESET_PARSER>; + reset-names = "esparser"; + }; + vpu: vpu@ff900000 { compatible = "amlogic,meson-g12a-vpu"; reg = <0x0 0xff900000 0x0 0x100000>,
Signature · 1 line
2.22.0
Kevin Hilman
maintainerRe: [PATCH 4/4] arm64: dts: meson-g12-common: add video decoder node
Quoted 6 lines · Neil Armstrong
From: Maxime Jourdan <[email protected]>
Add the video decoder node for the Amlogic G12A and compatible SoC.
Signed-off-by Maxime Jourdan <[email protected]>Signed-off-by Neil Armstrong <[email protected]>
Queued for v5.6,
Kevin