| Message ID | 20240620142532.406564-5-detlev.casanova@collabora.com |
|---|---|
| State | New |
| Headers | show |
| Series | media: rockchip: Add rkvdec2 driver | expand |
Hi Datlev, On 2024-06-20 16:19, Detlev Casanova wrote: > Add the rkvdec2 Video Decoder to the RK3588s devicetree. > > Signed-off-by: Detlev Casanova <detlev.casanova@collabora.com> > --- > arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 48 +++++++++++++++++++++++ > 1 file changed, 48 insertions(+) > > diff --git a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi > index 6ac5ac8b48ab..9c44c99125b4 100644 > --- a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi > +++ b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi > @@ -2596,6 +2596,16 @@ system_sram2: sram@ff001000 { > ranges = <0x0 0x0 0xff001000 0xef000>; > #address-cells = <1>; > #size-cells = <1>; > + > + vdec0_sram: rkvdec-sram@0 { The node name should reflect the purpose of the node, not sure rkvdec is a good purpose, cache-sram/codec-sram/sram-section could be a better node name. node name pattern: ^([a-z0-9]*-)?sram(-section)?@[a-f0-9]+$ > + reg = <0x0 0x78000>; > + pool; > + }; > + > + vdec1_sram: rkvdec-sram@1 { The binding for sram mention: Following the generic-names recommended practice, node names should reflect the purpose of the node. Unit address (@<address>) should be appended to the name. so the unit address should be @78000 and not @1. For name see above. Regards, Jonas > + reg = <0x78000 0x77000>; > + pool; > + }; > }; > > pinctrl: pinctrl { [snip]
Hi Jonas, On Thursday, June 20, 2024 11:00:49 A.M. EDT Jonas Karlman wrote: > Hi Detlev, > > On 2024-06-20 16:19, Detlev Casanova wrote: > > Add the rkvdec2 Video Decoder to the RK3588s devicetree. > > > > Signed-off-by: Detlev Casanova <detlev.casanova@collabora.com> > > --- > > > > arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 48 +++++++++++++++++++++++ > > 1 file changed, 48 insertions(+) > > > > diff --git a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi > > b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi index > > 6ac5ac8b48ab..9c44c99125b4 100644 > > --- a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi > > +++ b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi > > @@ -2596,6 +2596,16 @@ system_sram2: sram@ff001000 { > > > > ranges = <0x0 0x0 0xff001000 0xef000>; > > #address-cells = <1>; > > #size-cells = <1>; > > > > + > > + vdec0_sram: rkvdec-sram@0 { > > + reg = <0x0 0x78000>; > > + pool; > > + }; > > + > > + vdec1_sram: rkvdec-sram@1 { > > + reg = <0x78000 0x77000>; > > + pool; > > + }; > > > > }; > > > > pinctrl: pinctrl { > > > > @@ -2665,6 +2675,44 @@ gpio4: gpio@fec50000 { > > > > #interrupt-cells = <2>; > > > > }; > > > > }; > > > > + > > + vdec0: video-decoder@fdc38100 { > > This and the vdec1 node should probably be added between > > pmu: power-management@fd8d8000 > > and > > av1d: video-codec@fdc70000 > > to follow reg order. > > Also I am wondering if the nodes should be named > > video-codec@fdc38000 > > and > > video-codec@fdc40000 > > to match "1.1 Address Mapping" in TRM and the actual base address for > the VDPU381 IP and video-codec is used for other codec nodes. > > > + compatible = "rockchip,rk3588-vdec"; > > + reg = <0x0 0xfdc38100 0x0 0x500>; > > For existing rkvdec1 devices the cache regs is also included in the > range, should cache regs also be included for rkvdec2?, e.g.: > > reg = <0x0 0xfdc38100 0x0 0x600>; > > And maybe it also should include the link list regs, e.g.: > > reg = <0x0 0xfdc38000 0x0 0x700>; > > or possible: > > reg = <0x0 0xfdc38000 0x0 0x100>, > <0x0 0xfdc38100 0x0 0x500>, > <0x0 0xfdc38600 0x0 0x100>; > > Something like that may be a better description of the hw. Would it make sense to also add reg-names then ? reg-names = "link", "function", "cache"; Detlev. > > + interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH 0>; > > + clocks = <&cru ACLK_RKVDEC0>, <&cru HCLK_RKVDEC0>, <&cru > > CLK_RKVDEC0_CA>, + <&cru CLK_RKVDEC0_CORE>, <&cru > > CLK_RKVDEC0_HEVC_CA>; > > + clock-names = "axi", "ahb", "cabac", "core", "hevc_cabac"; > > + assigned-clocks = <&cru ACLK_RKVDEC0>, <&cru CLK_RKVDEC0_CORE>, > > + <&cru CLK_RKVDEC0_CA>, <&cru CLK_RKVDEC0_HEVC_CA>; > > + assigned-clock-rates = <800000000>, <600000000>, > > + <600000000>, <1000000000>; > > + resets = <&cru SRST_A_RKVDEC0>, <&cru SRST_H_RKVDEC0>, <&cru > > SRST_RKVDEC0_CA>, + <&cru SRST_RKVDEC0_CORE>, <&cru > > SRST_RKVDEC0_HEVC_CA>; > > + reset-names = "rst_axi", "rst_ahb", "rst_cabac", > > + "rst_core", "rst_hevc_cabac"; > > Do we need to include the rst prefix in the reset name?, does not look > like other DT/bindings normally include rst in their name. > > > + power-domains = <&power RK3588_PD_RKVDEC0>; > > + sram = <&vdec0_sram>; > > + }; > > + > > + vdec1: video-decoder@fdc40100 { > > Same as above. > > > + compatible = "rockchip,rk3588-vdec"; > > + reg = <0x0 0xfdc40100 0x0 0x500>; > > Same as above. > > Regards, > Jonas > > > + interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH 0>; > > + clocks = <&cru ACLK_RKVDEC1>, <&cru HCLK_RKVDEC1>, <&cru > > CLK_RKVDEC1_CA>, + <&cru CLK_RKVDEC1_CORE>, <&cru > > CLK_RKVDEC1_HEVC_CA>; > > + clock-names = "axi", "ahb", "cabac", "core", "hevc_cabac"; > > + assigned-clocks = <&cru ACLK_RKVDEC1>, <&cru CLK_RKVDEC1_CORE>, > > + <&cru CLK_RKVDEC1_CA>, <&cru CLK_RKVDEC1_HEVC_CA>; > > + assigned-clock-rates = <800000000>, <600000000>, > > + <600000000>, <1000000000>; > > + resets = <&cru SRST_A_RKVDEC1>, <&cru SRST_H_RKVDEC1>, <&cru > > SRST_RKVDEC1_CA>, + <&cru SRST_RKVDEC1_CORE>, <&cru > > SRST_RKVDEC1_HEVC_CA>; > > + reset-names = "rst_axi", "rst_ahb", "rst_cabac", > > + "rst_core", "rst_hevc_cabac"; > > + power-domains = <&power RK3588_PD_RKVDEC1>; > > + sram = <&vdec1_sram>; > > + }; > > > > }; > > > > #include "rk3588s-pinctrl.dtsi"
Hi, I just confirmed that this driver also works for rk356x. I tested it on orangepi3b with kernel 6.9, and chromium can decode 4K H264 video with hardware acceleration. Here is the devicetree patch for rk356x: https://github.com/amazingfate/build/blob/4c3564bc82b8963246450d3ebe1ad93965e7c22f/patch/kernel/archive/rockchip64-6.9/rk356x-add-rkvdec2-support.patch Please ignore the change of vpu's compatiable string change. I did that to disable its 1080p h264 hantro g1 decoder. Best regards, Jianfeng
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi index 6ac5ac8b48ab..9c44c99125b4 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi @@ -2596,6 +2596,16 @@ system_sram2: sram@ff001000 { ranges = <0x0 0x0 0xff001000 0xef000>; #address-cells = <1>; #size-cells = <1>; + + vdec0_sram: rkvdec-sram@0 { + reg = <0x0 0x78000>; + pool; + }; + + vdec1_sram: rkvdec-sram@1 { + reg = <0x78000 0x77000>; + pool; + }; }; pinctrl: pinctrl { @@ -2665,6 +2675,44 @@ gpio4: gpio@fec50000 { #interrupt-cells = <2>; }; }; + + vdec0: video-decoder@fdc38100 { + compatible = "rockchip,rk3588-vdec"; + reg = <0x0 0xfdc38100 0x0 0x500>; + interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH 0>; + clocks = <&cru ACLK_RKVDEC0>, <&cru HCLK_RKVDEC0>, <&cru CLK_RKVDEC0_CA>, + <&cru CLK_RKVDEC0_CORE>, <&cru CLK_RKVDEC0_HEVC_CA>; + clock-names = "axi", "ahb", "cabac", "core", "hevc_cabac"; + assigned-clocks = <&cru ACLK_RKVDEC0>, <&cru CLK_RKVDEC0_CORE>, + <&cru CLK_RKVDEC0_CA>, <&cru CLK_RKVDEC0_HEVC_CA>; + assigned-clock-rates = <800000000>, <600000000>, + <600000000>, <1000000000>; + resets = <&cru SRST_A_RKVDEC0>, <&cru SRST_H_RKVDEC0>, <&cru SRST_RKVDEC0_CA>, + <&cru SRST_RKVDEC0_CORE>, <&cru SRST_RKVDEC0_HEVC_CA>; + reset-names = "rst_axi", "rst_ahb", "rst_cabac", + "rst_core", "rst_hevc_cabac"; + power-domains = <&power RK3588_PD_RKVDEC0>; + sram = <&vdec0_sram>; + }; + + vdec1: video-decoder@fdc40100 { + compatible = "rockchip,rk3588-vdec"; + reg = <0x0 0xfdc40100 0x0 0x500>; + interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH 0>; + clocks = <&cru ACLK_RKVDEC1>, <&cru HCLK_RKVDEC1>, <&cru CLK_RKVDEC1_CA>, + <&cru CLK_RKVDEC1_CORE>, <&cru CLK_RKVDEC1_HEVC_CA>; + clock-names = "axi", "ahb", "cabac", "core", "hevc_cabac"; + assigned-clocks = <&cru ACLK_RKVDEC1>, <&cru CLK_RKVDEC1_CORE>, + <&cru CLK_RKVDEC1_CA>, <&cru CLK_RKVDEC1_HEVC_CA>; + assigned-clock-rates = <800000000>, <600000000>, + <600000000>, <1000000000>; + resets = <&cru SRST_A_RKVDEC1>, <&cru SRST_H_RKVDEC1>, <&cru SRST_RKVDEC1_CA>, + <&cru SRST_RKVDEC1_CORE>, <&cru SRST_RKVDEC1_HEVC_CA>; + reset-names = "rst_axi", "rst_ahb", "rst_cabac", + "rst_core", "rst_hevc_cabac"; + power-domains = <&power RK3588_PD_RKVDEC1>; + sram = <&vdec1_sram>; + }; }; #include "rk3588s-pinctrl.dtsi"
Add the rkvdec2 Video Decoder to the RK3588s devicetree. Signed-off-by: Detlev Casanova <detlev.casanova@collabora.com> --- arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 48 +++++++++++++++++++++++ 1 file changed, 48 insertions(+)