Skip to contentSkip to conversation

arm64: dts: qcom: sc7280: Add gpu support

PATCH Superseded Akhil P Oommen 2 participants 2 messages Jul 23, 2021 – Jul 24, 2021

Subsystems (4)

v1 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm64: dts: qcom: sc7280: Add gpu support

Add the necessary dt nodes for gpu support in sc7280.

---
This patch has dependency on the GPUCC bindings patch here:
https://patchwork.kernel.org/project/linux-arm-msm/patch/[email protected]/

 arch/arm64/boot/dts/qcom/sc7280.dtsi | 107 +++++++++++++++++++++++++++++++++++
 1 file changed, 107 insertions(+)
arch/arm64/boot/dts/qcom/sc7280.dtsi +107 -0
index 029723a..beb313c 100644
@@ -16,6 +16,8 @@
 #include <dt-bindings/reset/qcom,sdm845-pdc.h>
 #include <dt-bindings/soc/qcom,rpmh-rsc.h>
 #include <dt-bindings/thermal/thermal.h>
+#include <dt-bindings/interconnect/qcom,sc7280.h>
+#include <dt-bindings/clock/qcom,gpucc-sc7280.h>
 
 / {
 	interrupt-parent = <&intc>;
@@ -592,6 +594,111 @@
 			qcom,bcm-voters = <&apps_bcm_voter>;
 		};
 
+		gpu: gpu@3d00000 {
+			compatible = "qcom,adreno-635.0", "qcom,adreno";
+			#stream-id-cells = <16>;
+			reg = <0 0x03d00000 0 0x40000>, <0 0x03d9e000 0 0x1000>,
+				<0 0x03d61000 0 0x800>;
+			reg-names = "kgsl_3d0_reg_memory", "cx_mem", "cx_dbgc";
+			interrupts = <GIC_SPI 300 IRQ_TYPE_LEVEL_HIGH>;
+			iommus = <&adreno_smmu 0 0x401>;
+			operating-points-v2 = <&gpu_opp_table>;
+			qcom,gmu = <&gmu>;
+			interconnects = <&gem_noc MASTER_GFX3D 0 &mc_virt SLAVE_EBI1 0>;
+			interconnect-names = "gfx-mem";
+
+			gpu_opp_table: opp-table {
+				compatible = "operating-points-v2";
+
+				opp-550000000 {
+					opp-hz = /bits/ 64 <550000000>;
+					opp-level = <RPMH_REGULATOR_LEVEL_SVS_L1>;
+					opp-peak-kBps = <6832000>;
+				};
+
+				opp-450000000 {
+					opp-hz = /bits/ 64 <450000000>;
+					opp-level = <RPMH_REGULATOR_LEVEL_SVS>;
+					opp-peak-kBps = <4068000>;
+				};
+
+				opp-315000000 {
+					opp-hz = /bits/ 64 <315000000>;
+					opp-level = <RPMH_REGULATOR_LEVEL_LOW_SVS>;
+					opp-peak-kBps = <1804000>;
+				};
+			};
+		};
+
+		adreno_smmu: iommu@3da0000 {
+			compatible = "qcom,sc7280-smmu-500", "qcom,adreno-smmu", "arm,mmu-500";
+			reg = <0 0x03da0000 0 0x20000>;
+			#iommu-cells = <2>;
+			#global-interrupts = <2>;
+			interrupts = <GIC_SPI 673 IRQ_TYPE_LEVEL_HIGH>,
+					<GIC_SPI 675 IRQ_TYPE_LEVEL_HIGH>,
+					<GIC_SPI 678 IRQ_TYPE_LEVEL_HIGH>,
+					<GIC_SPI 679 IRQ_TYPE_LEVEL_HIGH>,
+					<GIC_SPI 680 IRQ_TYPE_LEVEL_HIGH>,
+					<GIC_SPI 681 IRQ_TYPE_LEVEL_HIGH>,
+					<GIC_SPI 682 IRQ_TYPE_LEVEL_HIGH>,
+					<GIC_SPI 683 IRQ_TYPE_LEVEL_HIGH>,
+					<GIC_SPI 684 IRQ_TYPE_LEVEL_HIGH>,
+					<GIC_SPI 685 IRQ_TYPE_LEVEL_HIGH>,
+					<GIC_SPI 686 IRQ_TYPE_LEVEL_HIGH>,
+					<GIC_SPI 687 IRQ_TYPE_LEVEL_HIGH>;
+
+			clocks = <&gcc GCC_GPU_MEMNOC_GFX_CLK>,
+					<&gcc GCC_GPU_SNOC_DVM_GFX_CLK>,
+					<&gpucc GPU_CC_AHB_CLK>,
+					<&gpucc GPU_CC_HLOS1_VOTE_GPU_SMMU_CLK>,
+					<&gpucc GPU_CC_CX_GMU_CLK>,
+					<&gpucc GPU_CC_HUB_CX_INT_CLK>,
+					<&gpucc GPU_CC_HUB_AON_CLK>;
+			clock-names = "gcc_gpu_memnoc_gfx_clk",
+					"gcc_gpu_snoc_dvm_gfx_clk",
+					"gpu_cc_ahb_clk",
+					"gpu_cc_hlos1_vote_gpu_smmu_clk",
+					"gpu_cc_cx_gmu_clk",
+					"gpu_cc_hub_cx_int_clk",
+					"gpu_cc_hub_aon_clk";
+
+			power-domains = <&gpucc GPU_CC_CX_GDSC>;
+		};
+
+		gmu: gmu@3d69000 {
+			compatible="qcom,adreno-gmu-635.0", "qcom,adreno-gmu";
+			reg = <0 0x03d6a000 0 0x34000>,
+				<0 0x3de0000 0 0x10000>,
+				<0 0x0b290000 0 0x10000>;
+			reg-names = "gmu", "rscc", "gmu_pdc";
+			interrupts = <GIC_SPI 304 IRQ_TYPE_LEVEL_HIGH>,
+					<GIC_SPI 305 IRQ_TYPE_LEVEL_HIGH>;
+			interrupt-names = "hfi", "gmu";
+			clocks = <&gpucc GPU_CC_CX_GMU_CLK>,
+					<&gpucc GPU_CC_CXO_CLK>,
+					<&gcc GCC_DDRSS_GPU_AXI_CLK>,
+					<&gcc GCC_GPU_MEMNOC_GFX_CLK>,
+					<&gpucc GPU_CC_AHB_CLK>,
+					<&gpucc GPU_CC_HUB_CX_INT_CLK>,
+					<&gpucc GPU_CC_HLOS1_VOTE_GPU_SMMU_CLK>;
+			clock-names = "gmu", "cxo", "axi", "memnoc", "ahb",
+					"hub", "smmu_vote";
+			power-domains = <&gpucc GPU_CC_CX_GDSC>, <&gpucc GPU_CC_GX_GDSC>;
+			power-domain-names = "cx", "gx";
+			iommus = <&adreno_smmu 5 0x400>;
+			operating-points-v2 = <&gmu_opp_table>;
+
+			gmu_opp_table: opp-table {
+				compatible = "operating-points-v2";
+
+				opp-200000000 {
+					opp-hz = /bits/ 64 <200000000>;
+					opp-level = <RPMH_REGULATOR_LEVEL_MIN_SVS>;
+				};
+			};
+		};
+
 		gpucc: clock-controller@3d90000 {
 			compatible = "qcom,sc7280-gpucc";
 			reg = <0 0x03d90000 0 0x9000>;
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation.
#1 lore raw

Quoting Akhil P Oommen (2021-07-23 04:20:54)

Quoted 15 lines

Add the necessary dt nodes for gpu support in sc7280.

---
This patch has dependency on the GPUCC bindings patch here:
https://patchwork.kernel.org/project/linux-arm-msm/patch/[email protected]/

 arch/arm64/boot/dts/qcom/sc7280.dtsi | 107 +++++++++++++++++++++++++++++++++++
 1 file changed, 107 insertions(+)
arch/arm64/boot/dts/qcom/sc7280.dtsi +0 -0
index 029723a..beb313c 100644

arch/arm64/boot/dts/qcom/sc7280.dtsi line 20

Quoted 5 lines
arch/arm64/boot/dts/qcom/sc7280.dtsi +2 -0
@@ -16,6 +16,8 @@
 #include <dt-bindings/reset/qcom,sdm845-pdc.h>
 #include <dt-bindings/soc/qcom,rpmh-rsc.h>
 #include <dt-bindings/thermal/thermal.h>
+#include <dt-bindings/interconnect/qcom,sc7280.h>
+#include <dt-bindings/clock/qcom,gpucc-sc7280.h>

Please sort this alphabetically.

arch/arm64/boot/dts/qcom/sc7280.dtsi line 597

Quoted 8 lines
arch/arm64/boot/dts/qcom/sc7280.dtsi +1 -0
 / {
        interrupt-parent = <&intc>;
@@ -592,6 +594,111 @@
                        qcom,bcm-voters = <&apps_bcm_voter>;
                };
 
+               gpu: gpu@3d00000 {

Will this label be used? If not, please don't add it.

arch/arm64/boot/dts/qcom/sc7280.dtsi line 602

Quoted 5 lines
arch/arm64/boot/dts/qcom/sc7280.dtsi +5 -0
+                       compatible = "qcom,adreno-635.0", "qcom,adreno";
+                       #stream-id-cells = <16>;
+                       reg = <0 0x03d00000 0 0x40000>, <0 0x03d9e000 0 0x1000>,
+                               <0 0x03d61000 0 0x800>;
+                       reg-names = "kgsl_3d0_reg_memory", "cx_mem", "cx_dbgc";

I'd prefer to see one reg and reg-names per line if the list is longer than one line.

		reg = < >,
		      < >,
		      < >;
		reg-names = " ",
		            " ",
			    " ";

It makes is much easier to figure out which property lines up with which name.

Quoted 21 lines
arch/arm64/boot/dts/qcom/sc7280.dtsi +21 -0
+                       interrupts = <GIC_SPI 300 IRQ_TYPE_LEVEL_HIGH>;
+                       iommus = <&adreno_smmu 0 0x401>;
+                       operating-points-v2 = <&gpu_opp_table>;
+                       qcom,gmu = <&gmu>;
+                       interconnects = <&gem_noc MASTER_GFX3D 0 &mc_virt SLAVE_EBI1 0>;
+                       interconnect-names = "gfx-mem";
+
+                       gpu_opp_table: opp-table {
+                               compatible = "operating-points-v2";
+
+                               opp-550000000 {
+                                       opp-hz = /bits/ 64 <550000000>;
+                                       opp-level = <RPMH_REGULATOR_LEVEL_SVS_L1>;
+                                       opp-peak-kBps = <6832000>;
+                               };
+
+                               opp-450000000 {
+                                       opp-hz = /bits/ 64 <450000000>;
+                                       opp-level = <RPMH_REGULATOR_LEVEL_SVS>;
+                                       opp-peak-kBps = <4068000>;
+                               };

arch/arm64/boot/dts/qcom/sc7280.dtsi line 633

Quoted 10 lines
arch/arm64/boot/dts/qcom/sc7280.dtsi +10 -0
+
+                               opp-315000000 {
+                                       opp-hz = /bits/ 64 <315000000>;
+                                       opp-level = <RPMH_REGULATOR_LEVEL_LOW_SVS>;
+                                       opp-peak-kBps = <1804000>;
+                               };
+                       };
+               };
+
+               adreno_smmu: iommu@3da0000 {

3da0000 comes after 3d69000, please sort this by unit address.

Quoted 43 lines
arch/arm64/boot/dts/qcom/sc7280.dtsi +43 -0
+                       compatible = "qcom,sc7280-smmu-500", "qcom,adreno-smmu", "arm,mmu-500";
+                       reg = <0 0x03da0000 0 0x20000>;
+                       #iommu-cells = <2>;
+                       #global-interrupts = <2>;
+                       interrupts = <GIC_SPI 673 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 675 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 678 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 679 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 680 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 681 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 682 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 683 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 684 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 685 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 686 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 687 IRQ_TYPE_LEVEL_HIGH>;
+
+                       clocks = <&gcc GCC_GPU_MEMNOC_GFX_CLK>,
+                                       <&gcc GCC_GPU_SNOC_DVM_GFX_CLK>,
+                                       <&gpucc GPU_CC_AHB_CLK>,
+                                       <&gpucc GPU_CC_HLOS1_VOTE_GPU_SMMU_CLK>,
+                                       <&gpucc GPU_CC_CX_GMU_CLK>,
+                                       <&gpucc GPU_CC_HUB_CX_INT_CLK>,
+                                       <&gpucc GPU_CC_HUB_AON_CLK>;
+                       clock-names = "gcc_gpu_memnoc_gfx_clk",
+                                       "gcc_gpu_snoc_dvm_gfx_clk",
+                                       "gpu_cc_ahb_clk",
+                                       "gpu_cc_hlos1_vote_gpu_smmu_clk",
+                                       "gpu_cc_cx_gmu_clk",
+                                       "gpu_cc_hub_cx_int_clk",
+                                       "gpu_cc_hub_aon_clk";
+
+                       power-domains = <&gpucc GPU_CC_CX_GDSC>;
+               };
+
+               gmu: gmu@3d69000 {
+                       compatible="qcom,adreno-gmu-635.0", "qcom,adreno-gmu";
+                       reg = <0 0x03d6a000 0 0x34000>,
+                               <0 0x3de0000 0 0x10000>,
+                               <0 0x0b290000 0 0x10000>;
+                       reg-names = "gmu", "rscc", "gmu_pdc";
+                       interrupts = <GIC_SPI 304 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 305 IRQ_TYPE_LEVEL_HIGH>;

arch/arm64/boot/dts/qcom/sc7280.dtsi line 686

Quoted 10 lines
arch/arm64/boot/dts/qcom/sc7280.dtsi +10 -0
+                       interrupt-names = "hfi", "gmu";
+                       clocks = <&gpucc GPU_CC_CX_GMU_CLK>,
+                                       <&gpucc GPU_CC_CXO_CLK>,
+                                       <&gcc GCC_DDRSS_GPU_AXI_CLK>,
+                                       <&gcc GCC_GPU_MEMNOC_GFX_CLK>,
+                                       <&gpucc GPU_CC_AHB_CLK>,
+                                       <&gpucc GPU_CC_HUB_CX_INT_CLK>,
+                                       <&gpucc GPU_CC_HLOS1_VOTE_GPU_SMMU_CLK>;
+                       clock-names = "gmu", "cxo", "axi", "memnoc", "ahb",
+                                       "hub", "smmu_vote";

Same comment about one line per clock for clock-names so we can easily match them up.

Quoted 5 lines
arch/arm64/boot/dts/qcom/sc7280.dtsi +5 -0
+                       power-domains = <&gpucc GPU_CC_CX_GDSC>, <&gpucc GPU_CC_GX_GDSC>;
+                       power-domain-names = "cx", "gx";
+                       iommus = <&adreno_smmu 5 0x400>;
+                       operating-points-v2 = <&gmu_opp_table>;
+