| Message ID | 20250110-drm-s4-v1-0-cbc2d5edaae8@amlogic.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | Subject: [PATCH 00/11] Add DRM support for Amlogic S4 | expand |
Hi, On 10/01/2025 06:39, Ao Xu via B4 Relay wrote: > This patch series adds DRM support for the Amlogic S4-series SoCs. > Compared to the Amlogic G12-series, the S4-series introduces the following changes: > > 1 The S4-series splits the HIU into three separate components: `sys_ctrl`, `pwr_ctrl`, and `clk_ctrl`. > As a result, VENC and VCLK drivers are updated with S4-specific compatible strings to accommodate these changes. > 2 The S4-series secures access to HDMITX DWC and TOP registers, > requiring modifications to the driver to handle this new access method. > 3 The register addresses for the video1 and video2 planes have been updated in the S4 hardware, > and the DRM driver has been adapted accordingly. > 4 The OSD, VIU, and VPP components remain unchanged and are consistent with the G12-series. Thanks a lot for this high quality changeset, happy to see DRM support for a new SoC ! I'll review it carefully next week. Neil > > Signed-off-by: Ao Xu <ao.xu@amlogic.com> > --- > Ao Xu (11): > dt-bindings: display: meson-dw-hdmi: Add compatible for S4 HDMI controller > dt-bindings: display: meson-vpu: Add compatible for S4 display controller > drm: meson: add S4 compatible for DRM driver > drm: meson: add primary and overlay plane support for S4 > drm: meson: update VIU and VPP support for S4 > drm: meson: add meson_dw_hdmi support for S4 > drm: meson: change api call parameter > drm: meson: add hdmitx vmode timing support for S4 > drm: meson: add vpu clk setting for S4 > drm: meson: add CVBS support for S4 > arm64: dts: amlogic: s4: add DRM support [1/1] > > .../bindings/display/amlogic,meson-dw-hdmi.yaml | 1 + > .../bindings/display/amlogic,meson-vpu.yaml | 48 +- > .../boot/dts/amlogic/meson-s4-s805x2-aq222.dts | 39 + > arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 121 +++ > drivers/gpu/drm/meson/meson_crtc.c | 90 +- > drivers/gpu/drm/meson/meson_drv.c | 127 ++- > drivers/gpu/drm/meson/meson_drv.h | 6 + > drivers/gpu/drm/meson/meson_dw_hdmi.c | 244 ++++- > drivers/gpu/drm/meson/meson_dw_hdmi.h | 126 +++ > drivers/gpu/drm/meson/meson_encoder_cvbs.c | 10 + > drivers/gpu/drm/meson/meson_encoder_hdmi.c | 19 +- > drivers/gpu/drm/meson/meson_overlay.c | 7 +- > drivers/gpu/drm/meson/meson_plane.c | 24 +- > drivers/gpu/drm/meson/meson_registers.h | 17 + > drivers/gpu/drm/meson/meson_vclk.c | 1018 ++++++++++++++------ > drivers/gpu/drm/meson/meson_venc.c | 346 ++++++- > drivers/gpu/drm/meson/meson_venc.h | 4 +- > drivers/gpu/drm/meson/meson_viu.c | 9 +- > drivers/gpu/drm/meson/meson_vpp.c | 12 +- > 19 files changed, 1865 insertions(+), 403 deletions(-) > --- > base-commit: 6ecd20965bdc21b265a0671ccf36d9ad8043f5ab > change-id: 20250110-drm-s4-c96c88be52e4 > > Best regards,
On Fri, 10 Jan 2025 13:39:50 +0800, Ao Xu wrote: > This patch series adds DRM support for the Amlogic S4-series SoCs. > Compared to the Amlogic G12-series, the S4-series introduces the following changes: > > 1 The S4-series splits the HIU into three separate components: `sys_ctrl`, `pwr_ctrl`, and `clk_ctrl`. > As a result, VENC and VCLK drivers are updated with S4-specific compatible strings to accommodate these changes. > 2 The S4-series secures access to HDMITX DWC and TOP registers, > requiring modifications to the driver to handle this new access method. > 3 The register addresses for the video1 and video2 planes have been updated in the S4 hardware, > and the DRM driver has been adapted accordingly. > 4 The OSD, VIU, and VPP components remain unchanged and are consistent with the G12-series. > > Signed-off-by: Ao Xu <ao.xu@amlogic.com> > --- > Ao Xu (11): > dt-bindings: display: meson-dw-hdmi: Add compatible for S4 HDMI controller > dt-bindings: display: meson-vpu: Add compatible for S4 display controller > drm: meson: add S4 compatible for DRM driver > drm: meson: add primary and overlay plane support for S4 > drm: meson: update VIU and VPP support for S4 > drm: meson: add meson_dw_hdmi support for S4 > drm: meson: change api call parameter > drm: meson: add hdmitx vmode timing support for S4 > drm: meson: add vpu clk setting for S4 > drm: meson: add CVBS support for S4 > arm64: dts: amlogic: s4: add DRM support [1/1] > > .../bindings/display/amlogic,meson-dw-hdmi.yaml | 1 + > .../bindings/display/amlogic,meson-vpu.yaml | 48 +- > .../boot/dts/amlogic/meson-s4-s805x2-aq222.dts | 39 + > arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 121 +++ > drivers/gpu/drm/meson/meson_crtc.c | 90 +- > drivers/gpu/drm/meson/meson_drv.c | 127 ++- > drivers/gpu/drm/meson/meson_drv.h | 6 + > drivers/gpu/drm/meson/meson_dw_hdmi.c | 244 ++++- > drivers/gpu/drm/meson/meson_dw_hdmi.h | 126 +++ > drivers/gpu/drm/meson/meson_encoder_cvbs.c | 10 + > drivers/gpu/drm/meson/meson_encoder_hdmi.c | 19 +- > drivers/gpu/drm/meson/meson_overlay.c | 7 +- > drivers/gpu/drm/meson/meson_plane.c | 24 +- > drivers/gpu/drm/meson/meson_registers.h | 17 + > drivers/gpu/drm/meson/meson_vclk.c | 1018 ++++++++++++++------ > drivers/gpu/drm/meson/meson_venc.c | 346 ++++++- > drivers/gpu/drm/meson/meson_venc.h | 4 +- > drivers/gpu/drm/meson/meson_viu.c | 9 +- > drivers/gpu/drm/meson/meson_vpp.c | 12 +- > 19 files changed, 1865 insertions(+), 403 deletions(-) > --- > base-commit: 6ecd20965bdc21b265a0671ccf36d9ad8043f5ab > change-id: 20250110-drm-s4-c96c88be52e4 > > Best regards, > -- > Ao Xu <ao.xu@amlogic.com> > > > My bot found new DTB warnings on the .dts files added or changed in this series. Some warnings may be from an existing SoC .dtsi. Or perhaps the warnings are fixed by another series. Ultimately, it is up to the platform maintainer whether these warnings are acceptable or not. No need to reply unless the platform maintainer has comments. If you already ran DT checks and didn't see these error(s), then make sure dt-schema is up to date: pip3 install dtschema --upgrade New warnings running 'make CHECK_DTBS=y for arch/arm64/boot/dts/amlogic/' for 20250110-drm-s4-v1-0-cbc2d5edaae8@amlogic.com: arch/arm64/boot/dts/amlogic/meson-s4-s805x2-aq222.dtb: vpu@ff000000: reg: [[0, 4278190080, 0, 262144], [0, 4261445632, 0, 8192], [0, 4261412864, 0, 8192], [0, 4261462016, 0, 2048], [0, 4261478400, 0, 256]] is too long from schema $id: http://devicetree.org/schemas/display/amlogic,meson-vpu.yaml# arch/arm64/boot/dts/amlogic/meson-s4-s805x2-aq222.dtb: vpu@ff000000: reg-names: ['vpu', 'hhi', 'clkctrl', 'pwrctrl', 'sysctrl'] is too long from schema $id: http://devicetree.org/schemas/display/amlogic,meson-vpu.yaml# arch/arm64/boot/dts/amlogic/meson-s4-s805x2-aq222.dtb: vpu@ff000000: reg-names:3: 'pwctrl' was expected from schema $id: http://devicetree.org/schemas/display/amlogic,meson-vpu.yaml# arch/arm64/boot/dts/amlogic/meson-s4-s805x2-aq222.dtb: vpu@ff000000: 'assigned-clock-parents', 'assigned-clock-rates', 'assigned-clocks', 'clock-names', 'clocks' do not match any of the regexes: 'pinctrl-[0-9]+' from schema $id: http://devicetree.org/schemas/display/amlogic,meson-vpu.yaml#
This patch series adds DRM support for the Amlogic S4-series SoCs. Compared to the Amlogic G12-series, the S4-series introduces the following changes: 1 The S4-series splits the HIU into three separate components: `sys_ctrl`, `pwr_ctrl`, and `clk_ctrl`. As a result, VENC and VCLK drivers are updated with S4-specific compatible strings to accommodate these changes. 2 The S4-series secures access to HDMITX DWC and TOP registers, requiring modifications to the driver to handle this new access method. 3 The register addresses for the video1 and video2 planes have been updated in the S4 hardware, and the DRM driver has been adapted accordingly. 4 The OSD, VIU, and VPP components remain unchanged and are consistent with the G12-series. Signed-off-by: Ao Xu <ao.xu@amlogic.com> --- Ao Xu (11): dt-bindings: display: meson-dw-hdmi: Add compatible for S4 HDMI controller dt-bindings: display: meson-vpu: Add compatible for S4 display controller drm: meson: add S4 compatible for DRM driver drm: meson: add primary and overlay plane support for S4 drm: meson: update VIU and VPP support for S4 drm: meson: add meson_dw_hdmi support for S4 drm: meson: change api call parameter drm: meson: add hdmitx vmode timing support for S4 drm: meson: add vpu clk setting for S4 drm: meson: add CVBS support for S4 arm64: dts: amlogic: s4: add DRM support [1/1] .../bindings/display/amlogic,meson-dw-hdmi.yaml | 1 + .../bindings/display/amlogic,meson-vpu.yaml | 48 +- .../boot/dts/amlogic/meson-s4-s805x2-aq222.dts | 39 + arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 121 +++ drivers/gpu/drm/meson/meson_crtc.c | 90 +- drivers/gpu/drm/meson/meson_drv.c | 127 ++- drivers/gpu/drm/meson/meson_drv.h | 6 + drivers/gpu/drm/meson/meson_dw_hdmi.c | 244 ++++- drivers/gpu/drm/meson/meson_dw_hdmi.h | 126 +++ drivers/gpu/drm/meson/meson_encoder_cvbs.c | 10 + drivers/gpu/drm/meson/meson_encoder_hdmi.c | 19 +- drivers/gpu/drm/meson/meson_overlay.c | 7 +- drivers/gpu/drm/meson/meson_plane.c | 24 +- drivers/gpu/drm/meson/meson_registers.h | 17 + drivers/gpu/drm/meson/meson_vclk.c | 1018 ++++++++++++++------ drivers/gpu/drm/meson/meson_venc.c | 346 ++++++- drivers/gpu/drm/meson/meson_venc.h | 4 +- drivers/gpu/drm/meson/meson_viu.c | 9 +- drivers/gpu/drm/meson/meson_vpp.c | 12 +- 19 files changed, 1865 insertions(+), 403 deletions(-) --- base-commit: 6ecd20965bdc21b265a0671ccf36d9ad8043f5ab change-id: 20250110-drm-s4-c96c88be52e4 Best regards,