ARM64: DT: add gpu for msm8916
PATCH 1/3 ARM64: DT: add gpu for msm8916
--- arch/arm64/boot/dts/qcom/msm8916.dtsi | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+)
arch/arm64/boot/dts/qcom/msm8916.dtsi +35 -0
@@ -204,6 +204,17 @@ }; + gpu_opp_table: opp_table { + compatible = "operating-points-v2"; + + opp-400000000 { + opp-hz = /bits/ 64 <400000000>; + }; + opp-19200000 { + opp-hz = /bits/ 64 <19200000>; + }; + }; + timer { compatible = "arm,armv8-timer"; interrupts = <GIC_PPI 2 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
@@ -698,6 +709,30 @@ #thermal-sensor-cells = <1>; }; + gpu@1c00000 { + compatible = "qcom,adreno-306.0", "qcom,adreno"; + reg = <0x01c00000 0x20000>; + reg-names = "kgsl_3d0_reg_memory"; + interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "kgsl_3d0_irq"; + clock-names = + "core", + "iface", + "mem", + "mem_iface", + "alt_mem_iface", + "gfx3d"; + clocks = + <&gcc GCC_OXILI_GFX3D_CLK>, + <&gcc GCC_OXILI_AHB_CLK>, + <&gcc GCC_OXILI_GMEM_CLK>, + <&gcc GCC_BIMC_GFX_CLK>, + <&gcc GCC_BIMC_GPU_CLK>, + <&gcc GFX3D_CLK_SRC>; + power-domains = <&gcc OXILI_GDSC>; + operating-points-v2 = <&gpu_opp_table>; + }; + mdss: mdss@1a00000 { compatible = "qcom,mdss"; reg = <0x1a00000 0x1000>,
Signature · 1 line
2.9.4
PATCH 2/3 ARM64: DT: add video codec devicetree node
From: Stanimir Varbanov <[email protected]>
--- arch/arm64/boot/dts/qcom/msm8916.dtsi | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)
arch/arm64/boot/dts/qcom/msm8916.dtsi +28 -0
@@ -88,6 +88,13 @@ no-map; }; + venus_mem: venus@89900000 { + compatible = "shared-dma-pool"; + reg = <0x0 0x89900000 0x0 0x800000>; + alignment = <0x1000>; + no-map; + }; + mba_mem: mba@8ea00000 { no-map; reg = <0 0x8ea00000 0 0x100000>;
@@ -1214,6 +1221,27 @@ }; }; }; + + venus: video-codec@1d00000 { + compatible = "qcom,msm8916-venus"; + reg = <0x01d00000 0xff000>; + interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>; + power-domains = <&gcc VENUS_GDSC>; + clocks = <&gcc GCC_VENUS0_VCODEC0_CLK>, + <&gcc GCC_VENUS0_AHB_CLK>, + <&gcc GCC_VENUS0_AXI_CLK>; + clock-names = "core", "iface", "bus"; + memory-region = <&venus_mem>; + status = "okay"; + + video-decoder { + compatible = "venus-decoder"; + }; + + video-encoder { + compatible = "venus-encoder"; + }; + }; }; smd {
Signature · 1 line
2.9.4
PATCH 3/3 ARM64: DT: add iommu for msm8916
In reply to Rob Clark--- arch/arm64/boot/dts/qcom/msm8916.dtsi | 57 +++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+)
arch/arm64/boot/dts/qcom/msm8916.dtsi +57 -0
@@ -716,6 +716,59 @@ #thermal-sensor-cells = <1>; }; + apps_iommu: iommu@1ef0000 { + #address-cells = <1>; + #size-cells = <1>; + #iommu-cells = <1>; + compatible = "qcom,msm8916-iommu", "qcom,msm-iommu-v1"; + ranges = <0 0x1e20000 0x40000>; + reg = <0x1ef0000 0x3000>; + clocks = <&gcc GCC_SMMU_CFG_CLK>, + <&gcc GCC_APSS_TCU_CLK>; + clock-names = "iface", "bus"; + qcom,iommu-secure-id = <17>; + + // mdp_0: + iommu-ctx@4000 { + compatible = "qcom,msm-iommu-v1-ns"; + reg = <0x4000 0x1000>; + interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>; + }; + + // venus_ns: + iommu-ctx@5000 { + compatible = "qcom,msm-iommu-v1-sec"; + reg = <0x5000 0x1000>; + interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>; + }; + }; + + gpu_iommu: iommu@1f08000 { + #address-cells = <1>; + #size-cells = <1>; + #iommu-cells = <1>; + compatible = "qcom,msm8916-iommu", "qcom,msm-iommu-v1"; + ranges = <0 0x1f08000 0x10000>; + clocks = <&gcc GCC_SMMU_CFG_CLK>, + <&gcc GCC_GFX_TCU_CLK>; + clock-names = "iface", "bus"; + qcom,iommu-secure-id = <18>; + + // gfx3d_user: + iommu-ctx@1000 { + compatible = "qcom,msm-iommu-v1-ns"; + reg = <0x1000 0x1000>; + interrupts = <GIC_SPI 241 IRQ_TYPE_LEVEL_HIGH>; + }; + + // gfx3d_priv: + iommu-ctx@2000 { + compatible = "qcom,msm-iommu-v1-ns"; + reg = <0x2000 0x1000>; + interrupts = <GIC_SPI 242 0>; + }; + }; + gpu@1c00000 { compatible = "qcom,adreno-306.0", "qcom,adreno"; reg = <0x01c00000 0x20000>;
@@ -738,6 +791,7 @@ <&gcc GFX3D_CLK_SRC>; power-domains = <&gcc OXILI_GDSC>; operating-points-v2 = <&gpu_opp_table>; + iommus = <&gpu_iommu 1>, <&gpu_iommu 2>; }; mdss: mdss@1a00000 {
@@ -781,6 +835,8 @@ "core_clk", "vsync_clk"; + iommus = <&apps_iommu 4>; + ports { #address-cells = <1>; #size-cells = <0>;
@@ -1231,6 +1287,7 @@ <&gcc GCC_VENUS0_AHB_CLK>, <&gcc GCC_VENUS0_AXI_CLK>; clock-names = "core", "iface", "bus"; + iommus = <&apps_iommu 5>; memory-region = <&venus_mem>; status = "okay";
Signature · 1 line
2.9.4
Quoted 2 lines · Rob Clark
Signed-off-by Rob Clark <[email protected]>---
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH 2/3] ARM64: DT: add video codec devicetree node
In reply to Rob ClarkQuoted 5 lines · Rob Clark
From: Stanimir Varbanov <[email protected]>
Signed-off-by Stanimir Varbanov <[email protected]>Signed-off-by Rob Clark <[email protected]>---
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH 3/3] ARM64: DT: add iommu for msm8916
In reply to Rob ClarkQuoted 2 lines · Rob Clark
Signed-off-by Rob Clark <[email protected]>---
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH 2/3] ARM64: DT: add video codec devicetree node
In reply to Rob ClarkHi Rob, Andy,
Quoted 13 lines · Rob Clark
From: Stanimir Varbanov <[email protected]>
Signed-off-by Stanimir Varbanov <[email protected]>Signed-off-by Rob Clark <[email protected]>--- arch/arm64/boot/dts/qcom/msm8916.dtsi | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)arch/arm64/boot/dts/qcom/msm8916.dtsi +0
-0
arch/arm64/boot/dts/qcom/msm8916.dtsi line 96
Quoted 9 lines
arch/arm64/boot/dts/qcom/msm8916.dtsi +6
-0@@ -88,6 +88,13 @@ no-map; }; + venus_mem: venus@89900000 { + compatible = "shared-dma-pool"; + reg = <0x0 0x89900000 0x0 0x800000>; + alignment = <0x1000>; + no-map; + };
In the spirit of 377a22d3caec3d2cda0cc996101121145ac43ff2 "media: venus:
don't abuse dma_alloc for non-DMA allocations" commit the above venus_mem should be changed to:
venus_mem: venus@89900000 {
reg = <0x0 0x89900000 0x0 0x600000>;
no-map;
};Quoted 10 lines
arch/arm64/boot/dts/qcom/msm8916.dtsi +3
-0+ mba_mem: mba@8ea00000 { no-map; reg = <0 0x8ea00000 0 0x100000>;@@ -1214,6 +1221,27 @@ }; }; }; + + venus: video-codec@1d00000 {
arch/arm64/boot/dts/qcom/msm8916.dtsi line 1235
Quoted 10 lines
arch/arm64/boot/dts/qcom/msm8916.dtsi +10
-0+ compatible = "qcom,msm8916-venus"; + reg = <0x01d00000 0xff000>; + interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>; + power-domains = <&gcc VENUS_GDSC>; + clocks = <&gcc GCC_VENUS0_VCODEC0_CLK>, + <&gcc GCC_VENUS0_AHB_CLK>, + <&gcc GCC_VENUS0_AXI_CLK>; + clock-names = "core", "iface", "bus"; + memory-region = <&venus_mem>; + status = "okay";
Is that correct, shouldn't the status be disabled and enabled in the board dts(i) files?
Quoted 13 lines
arch/arm64/boot/dts/qcom/msm8916.dtsi +9
-0+ + video-decoder { + compatible = "venus-decoder"; + }; + + video-encoder { + compatible = "venus-encoder"; + }; + }; }; smd {
Signature · 2 lines
regards, Stan
Re: [PATCH 2/3] ARM64: DT: add video codec devicetree node
Quoted 30 lines · Stanimir Varbanov
Hi Rob, Andy,
Quoted 13 lines · Rob Clark
From: Stanimir Varbanov <[email protected]>
Signed-off-by Stanimir Varbanov <[email protected]>Signed-off-by Rob Clark <[email protected]>--- arch/arm64/boot/dts/qcom/msm8916.dtsi | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)arch/arm64/boot/dts/qcom/msm8916.dtsi +0
-0arch/arm64/boot/dts/qcom/msm8916.dtsi line 96
Quoted 9 lines
arch/arm64/boot/dts/qcom/msm8916.dtsi +6
-0@@ -88,6 +88,13 @@ no-map; }; + venus_mem: venus@89900000 { + compatible = "shared-dma-pool"; + reg = <0x0 0x89900000 0x0 0x800000>; + alignment = <0x1000>; + no-map; + };In the spirit of
377a22d3caec3d2cda0cc996101121145ac43ff2"media: venus:
don't abusedma_allocfor non-DMA allocations" commit the abovevenus_memshould be changed to:
Quoted 5 lines
venus_mem: venus@89900000 {
reg = <0x0 0x89900000 0x0 0x600000>;
no-map;
};Ok, I'll fix this up. No need to send any update.
Quoted 15 lines
Quoted 15 lines
arch/arm64/boot/dts/qcom/msm8916.dtsi +8
-0+ mba_mem: mba@8ea00000 { no-map; reg = <0 0x8ea00000 0 0x100000>;@@ -1214,6 +1221,27 @@ }; }; }; + + venus: video-codec@1d00000 { + compatible = "qcom,msm8916-venus"; + reg = <0x01d00000 0xff000>; + interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>; + power-domains = <&gcc VENUS_GDSC>; + clocks = <&gcc GCC_VENUS0_VCODEC0_CLK>,
Quoted 8 lines
arch/arm64/boot/dts/qcom/msm8916.dtsi line 1235
Quoted 5 lines
arch/arm64/boot/dts/qcom/msm8916.dtsi +5
-0+ <&gcc GCC_VENUS0_AHB_CLK>, + <&gcc GCC_VENUS0_AXI_CLK>; + clock-names = "core", "iface", "bus"; + memory-region = <&venus_mem>; + status = "okay";Is that correct, shouldn't the status be disabled and enabled in the board dts(i) files?
There isn't anything board specific for this, so it should be enabled by default.
Quoted 11 lines
Quoted 11 lines
arch/arm64/boot/dts/qcom/msm8916.dtsi +9
-0+ + video-decoder { + compatible = "venus-decoder"; + }; + + video-encoder { + compatible = "venus-encoder"; + }; + }; };
Quoted 2 lines
arch/arm64/boot/dts/qcom/msm8916.dtsi line 1247
Quoted 2 lines
arch/arm64/boot/dts/qcom/msm8916.dtsi +0
-0smd {
Regards,
Andy