> On Jan 6, 2019, at 10:22 PM, Ezequiel Garcia <ezequiel@xxxxxxxxxxxxx> wrote: > > Hi Randy, > > Thanks a lot for this patches. They are really useful > to provide more insight into the VPU hardware. > > This change will make the vpu encoder and vpu decoder > completely independent, can they really work in parallel? As I said it depends on the platform, but with this patch, the user space would think they can work at the same time. BTW, not only the decoder, there is a post processor with the decoder, it can be used as part of the decoder pipeline with only a macro block delay or process the data from an external buffer. I forget to write a note on what this driver doesn’t present. The real one would have much complex scheduler system, but this one is just a queue. More task management feature are not there. Also the clock boosting is removing and the loading analysis, which are useful for encoder, especially on the rv1108. > Could you provide more details about what is > shared between these devices? No, if Rockchip doesn’t tell, my mouth is sealed. > Thanks a lot! > >> On Sun, 2019-01-06 at 02:31 +0800, Randy Li wrote: >> It offers an example how a full features video codec >> should be configured. >> >> The original clocks assignment don't look good, if the clocks >> lower than 300MHZ, most of decoing tasks would suffer from >> timeout problem, 500MHZ is also a little high for RK3399 >> running in a stable state. >> >> Signed-off-by: Randy Li <ayaka@xxxxxxxxxxx> >> --- >> .../boot/dts/rockchip/rk3399-sapphire.dtsi | 29 ++++++++ >> arch/arm64/boot/dts/rockchip/rk3399.dtsi | 68 +++++++++++++++++-- >> 2 files changed, 90 insertions(+), 7 deletions(-) >> >> diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi >> index 946d3589575a..c3db878bae45 100644 >> --- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi >> +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi >> @@ -632,6 +632,35 @@ >> dr_mode = "host"; >> }; >> >> +&rkvdec { >> + status = "okay"; >> +}; >> + >> +&rkvdec_srv { >> + status = "okay"; >> +}; >> + >> +&vdec_mmu { >> + status = "okay"; >> +}; >> + >> +&vdpu { >> + status = "okay"; >> +}; >> + >> +&vepu { >> + status = "okay"; >> +}; >> + >> +&vpu_service { >> + status = "okay"; >> +}; >> + >> +&vpu_mmu { >> + status = "okay"; >> + >> +}; >> + >> &vopb { >> status = "okay"; >> }; >> diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi >> index b22b2e40422b..5fa3247e7bf0 100644 >> --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi >> +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi >> @@ -1242,16 +1242,39 @@ >> status = "disabled"; >> }; >> >> - vpu: video-codec@ff650000 { >> - compatible = "rockchip,rk3399-vpu"; >> - reg = <0x0 0xff650000 0x0 0x800>; >> - interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH 0>, >> - <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH 0>; >> - interrupt-names = "vepu", "vdpu"; >> + vpu_service: vpu-srv { >> + compatible = "rockchip,mpp-service"; >> + status = "disabled"; >> + }; >> + >> + vepu: vpu-encoder@ff650000 { >> + compatible = "rockchip,vpu-encoder-v2"; >> + reg = <0x0 0xff650000 0x0 0x400>; >> + interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH 0>; >> + interrupt-names = "irq_enc"; >> clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>; >> - clock-names = "aclk", "hclk"; >> + clock-names = "aclk_vcodec", "hclk_vcodec"; >> + resets = <&cru SRST_H_VCODEC>, <&cru SRST_A_VCODEC>; >> + reset-names = "video_h", "video_a"; >> iommus = <&vpu_mmu>; >> power-domains = <&power RK3399_PD_VCODEC>; >> + rockchip,srv = <&vpu_service>; >> + status = "disabled"; >> + }; >> + >> + vdpu: vpu-decoder@ff650400 { >> + compatible = "rockchip,vpu-decoder-v2"; >> + reg = <0x0 0xff650400 0x0 0x400>; >> + interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH 0>; >> + interrupt-names = "irq_dec"; >> + iommus = <&vpu_mmu>; >> + clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>; >> + clock-names = "aclk_vcodec", "hclk_vcodec"; >> + resets = <&cru SRST_H_VCODEC>, <&cru SRST_A_VCODEC>; >> + reset-names = "video_h", "video_a"; >> + power-domains = <&power RK3399_PD_VCODEC>; >> + rockchip,srv = <&vpu_service>; >> + status = "disabled"; >> }; >> >> vpu_mmu: iommu@ff650800 { >> @@ -1261,11 +1284,42 @@ >> interrupt-names = "vpu_mmu"; >> clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>; >> clock-names = "aclk", "iface"; >> + assigned-clocks = <&cru ACLK_VCODEC_PRE>; >> + assigned-clock-parents = <&cru PLL_GPLL>; >> #iommu-cells = <0>; >> power-domains = <&power RK3399_PD_VCODEC>; >> status = "disabled"; >> }; >> >> + rkvdec_srv: rkvdec-srv { >> + compatible = "rockchip,mpp-service"; >> + status = "disabled"; >> + }; >> + >> + rkvdec: video-decoder@ff660000 { >> + compatible = "rockchip,video-decoder-v1"; >> + reg = <0x0 0xff660000 0x0 0x400>; >> + interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH 0>; >> + interrupt-names = "irq_dec"; >> + clocks = <&cru ACLK_VDU>, <&cru HCLK_VDU>, >> + <&cru SCLK_VDU_CA>, <&cru SCLK_VDU_CORE>; >> + clock-names = "aclk_vcodec", "hclk_vcodec", >> + "clk_cabac", "clk_core"; >> + assigned-clocks = <&cru ACLK_VDU_PRE>, <&cru SCLK_VDU_CA>, >> + <&cru SCLK_VDU_CORE>; >> + assigned-clock-parents = <&cru PLL_NPLL>, <&cru PLL_NPLL>, >> + <&cru PLL_NPLL>; >> + resets = <&cru SRST_H_VDU>, <&cru SRST_A_VDU>, >> + <&cru SRST_VDU_CORE>, <&cru SRST_VDU_CA>, >> + <&cru SRST_A_VDU_NOC>, <&cru SRST_H_VDU_NOC>; >> + reset-names = "video_h", "video_a", "video_core", "video_cabac", >> + "niu_a", "niu_h"; >> + power-domains = <&power RK3399_PD_VDU>; >> + rockchip,srv = <&rkvdec_srv>; >> + iommus = <&vdec_mmu>; >> + status = "disabled"; >> + }; >> + >> vdec_mmu: iommu@ff660480 { >> compatible = "rockchip,iommu"; >> reg = <0x0 0xff660480 0x0 0x40>, <0x0 0xff6604c0 0x0 0x40>; > >