Skip to contentSkip to conversation

drm/msm: Add support for GPU cooling

PATCH Superseded Akhil P Oommen 2 participants 6 messages Oct 28, 2020 – Oct 29, 2020

Subsystems (8)

v3 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/3 drm/msm: Add support for GPU cooling

Register GPU as a devfreq cooling device so that it can be passively cooled by the thermal framework.

---
Changes in v3:
1. Minor fix in binding documentation (RobH)
Changes in v2:
1. Update the dt bindings documentation

 drivers/gpu/drm/msm/msm_gpu.c | 12 ++++++++++++
 drivers/gpu/drm/msm/msm_gpu.h |  2 ++
 2 files changed, 14 insertions(+)
drivers/gpu/drm/msm/msm_gpu.c +12 -0
index 55d1648..9f9db46 100644
@@ -14,6 +14,7 @@
 #include <generated/utsrelease.h>
 #include <linux/string_helpers.h>
 #include <linux/devfreq.h>
+#include <linux/devfreq_cooling.h>
 #include <linux/devcoredump.h>
 #include <linux/sched/task.h>
 
@@ -107,9 +108,18 @@ static void msm_devfreq_init(struct msm_gpu *gpu)
 	if (IS_ERR(gpu->devfreq.devfreq)) {
 		DRM_DEV_ERROR(&gpu->pdev->dev, "Couldn't initialize GPU devfreq\n");
 		gpu->devfreq.devfreq = NULL;
+		return;
 	}
 
 	devfreq_suspend_device(gpu->devfreq.devfreq);
+
+	gpu->cooling = of_devfreq_cooling_register(gpu->pdev->dev.of_node,
+			gpu->devfreq.devfreq);
+	if (IS_ERR(gpu->cooling)) {
+		DRM_DEV_ERROR(&gpu->pdev->dev,
+				"Couldn't register GPU cooling device\n");
+		gpu->cooling = NULL;
+	}
 }
 
 static int enable_pwrrail(struct msm_gpu *gpu)
@@ -1005,4 +1015,6 @@ void msm_gpu_cleanup(struct msm_gpu *gpu)
 		gpu->aspace->mmu->funcs->detach(gpu->aspace->mmu);
 		msm_gem_address_space_put(gpu->aspace);
 	}
+
+	devfreq_cooling_unregister(gpu->cooling);
 }
drivers/gpu/drm/msm/msm_gpu.h +2 -0
index 6c9e1fd..9a8f20d 100644
@@ -147,6 +147,8 @@ struct msm_gpu {
 	struct msm_gpu_state *crashstate;
 	/* True if the hardware supports expanded apriv (a650 and newer) */
 	bool hw_apriv;
+
+	struct thermal_cooling_device *cooling;
 };
 
 static inline struct msm_gpu *dev_to_gpu(struct device *dev)
Signature · 6 lines
2.7.4

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#1 lore raw

PATCH v3 2/3 arm64: dts: qcom: sc7180: Add gpu cooling support

Add cooling-cells property and the cooling maps for the gpu tzones to support GPU cooling.

---
 arch/arm64/boot/dts/qcom/sc7180.dtsi | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)
arch/arm64/boot/dts/qcom/sc7180.dtsi +23 -7
index d46b383..a7ea029 100644
@@ -2,7 +2,7 @@
 /*
  * SC7180 SoC device tree source
  *
- * Copyright (c) 2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2019-20, The Linux Foundation. All rights reserved.
  */
 
 #include <dt-bindings/clock/qcom,dispcc-sc7180.h>
@@ -1886,6 +1886,8 @@
 			operating-points-v2 = <&gpu_opp_table>;
 			qcom,gmu = <&gmu>;
 
+			#cooling-cells = <2>;
+
 			interconnects = <&gem_noc MASTER_GFX3D &mc_virt SLAVE_EBI1>;
 			interconnect-names = "gfx-mem";
 
@@ -3825,16 +3827,16 @@
 		};
 
 		gpuss0-thermal {
-			polling-delay-passive = <0>;
+			polling-delay-passive = <100>;
 			polling-delay = <0>;
 
 			thermal-sensors = <&tsens0 13>;
 
 			trips {
 				gpuss0_alert0: trip-point0 {
-					temperature = <90000>;
+					temperature = <95000>;
 					hysteresis = <2000>;
-					type = "hot";
+					type = "passive";
 				};
 
 				gpuss0_crit: gpuss0_crit {
@@ -3843,19 +3845,26 @@
 					type = "critical";
 				};
 			};
+
+			cooling-maps {
+				map0 {
+					trip = <&gpuss0_alert0>;
+					cooling-device = <&gpu THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+				};
+			};
 		};
 
 		gpuss1-thermal {
-			polling-delay-passive = <0>;
+			polling-delay-passive = <100>;
 			polling-delay = <0>;
 
 			thermal-sensors = <&tsens0 14>;
 
 			trips {
 				gpuss1_alert0: trip-point0 {
-					temperature = <90000>;
+					temperature = <95000>;
 					hysteresis = <2000>;
-					type = "hot";
+					type = "passive";
 				};
 
 				gpuss1_crit: gpuss1_crit {
@@ -3864,6 +3873,13 @@
 					type = "critical";
 				};
 			};
+
+			cooling-maps {
+				map0 {
+					trip = <&gpuss0_alert0>;
+					cooling-device = <&gpu THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+				};
+			};
 		};
 
 		aoss1-thermal {
Signature · 6 lines
2.7.4

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Reviewed-by on v3 2/3
#2 lore raw

Re: [v3,2/3] arm64: dts: qcom: sc7180: Add gpu cooling support

Hi Akhil,

Quoted 81 lines · Akhil P Oommen

Add cooling-cells property and the cooling maps for the gpu tzones to support GPU cooling.

---
 arch/arm64/boot/dts/qcom/sc7180.dtsi | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)
arch/arm64/boot/dts/qcom/sc7180.dtsi +16 -7
index d46b383..a7ea029 100644
@@ -2,7 +2,7 @@
 /*
  * SC7180 SoC device tree source
  *
- * Copyright (c) 2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2019-20, The Linux Foundation. All rights reserved.
  */
 
 #include <dt-bindings/clock/qcom,dispcc-sc7180.h>
@@ -1886,6 +1886,8 @@
 			operating-points-v2 = <&gpu_opp_table>;
 			qcom,gmu = <&gmu>;
 
+			#cooling-cells = <2>;
+
 			interconnects = <&gem_noc MASTER_GFX3D &mc_virt SLAVE_EBI1>;
 			interconnect-names = "gfx-mem";
 
@@ -3825,16 +3827,16 @@
 		};
 
 		gpuss0-thermal {
-			polling-delay-passive = <0>;
+			polling-delay-passive = <100>;
 			polling-delay = <0>;
 
 			thermal-sensors = <&tsens0 13>;
 
 			trips {
 				gpuss0_alert0: trip-point0 {
-					temperature = <90000>;
+					temperature = <95000>;
 					hysteresis = <2000>;
-					type = "hot";
+					type = "passive";
 				};
 
 				gpuss0_crit: gpuss0_crit {
@@ -3843,19 +3845,26 @@
 					type = "critical";
 				};
 			};
+
+			cooling-maps {
+				map0 {
+					trip = <&gpuss0_alert0>;
+					cooling-device = <&gpu THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+				};
+			};
 		};
 
 		gpuss1-thermal {
-			polling-delay-passive = <0>;
+			polling-delay-passive = <100>;
 			polling-delay = <0>;
 
 			thermal-sensors = <&tsens0 14>;
 
 			trips {
 				gpuss1_alert0: trip-point0 {
-					temperature = <90000>;
+					temperature = <95000>;
 					hysteresis = <2000>;
-					type = "hot";
+					type = "passive";
 				};
 
 				gpuss1_crit: gpuss1_crit {

arch/arm64/boot/dts/qcom/sc7180.dtsi line 3879

Quoted 7 lines
arch/arm64/boot/dts/qcom/sc7180.dtsi +4 -0
@@ -3864,6 +3873,13 @@
 					type = "critical";
 				};
 			};
+
+			cooling-maps {
+				map0 {
+					trip = <&gpuss0_alert0>;

Copy & paste error, this should be 'gpuss1_alert0'.

arch/arm64/boot/dts/qcom/sc7180.dtsi line 3885

Quoted 6 lines
arch/arm64/boot/dts/qcom/sc7180.dtsi +3 -0
+					cooling-device = <&gpu THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+				};
+			};
 		};
 
 		aoss1-thermal {

Other than the C&P error:

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#3 lore raw

Re: [v3,2/3] arm64: dts: qcom: sc7180: Add gpu cooling support

Quoted 82 lines · On 10/29/2020 6:09 AM, [email protected] wrote:

Hi Akhil,

Quoted 79 lines · Akhil P Oommen

Add cooling-cells property and the cooling maps for the gpu tzones to support GPU cooling.

---
  arch/arm64/boot/dts/qcom/sc7180.dtsi | 30 +++++++++++++++++++++++-------
  1 file changed, 23 insertions(+), 7 deletions(-)
arch/arm64/boot/dts/qcom/sc7180.dtsi +16 -7
index d46b383..a7ea029 100644
@@ -2,7 +2,7 @@
  /*
   * SC7180 SoC device tree source
   *
- * Copyright (c) 2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2019-20, The Linux Foundation. All rights reserved.
   */
 
  #include <dt-bindings/clock/qcom,dispcc-sc7180.h>
@@ -1886,6 +1886,8 @@
  			operating-points-v2 = <&gpu_opp_table>;
  			qcom,gmu = <&gmu>;
 
+			#cooling-cells = <2>;
+
  			interconnects = <&gem_noc MASTER_GFX3D &mc_virt SLAVE_EBI1>;
  			interconnect-names = "gfx-mem";
 
@@ -3825,16 +3827,16 @@
  		};
 
  		gpuss0-thermal {
-			polling-delay-passive = <0>;
+			polling-delay-passive = <100>;
  			polling-delay = <0>;
 
  			thermal-sensors = <&tsens0 13>;
 
  			trips {
  				gpuss0_alert0: trip-point0 {
-					temperature = <90000>;
+					temperature = <95000>;
  					hysteresis = <2000>;
-					type = "hot";
+					type = "passive";
  				};
 
  				gpuss0_crit: gpuss0_crit {
@@ -3843,19 +3845,26 @@
  					type = "critical";
  				};
  			};
+
+			cooling-maps {
+				map0 {
+					trip = <&gpuss0_alert0>;
+					cooling-device = <&gpu THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+				};
+			};
  		};
 
  		gpuss1-thermal {
-			polling-delay-passive = <0>;
+			polling-delay-passive = <100>;
  			polling-delay = <0>;
 
  			thermal-sensors = <&tsens0 14>;
 
  			trips {
  				gpuss1_alert0: trip-point0 {
-					temperature = <90000>;
+					temperature = <95000>;
  					hysteresis = <2000>;
-					type = "hot";
+					type = "passive";
  				};
 
Quoted 11 lines

arch/arm64/boot/dts/qcom/sc7180.dtsi line 3879

Quoted 9 lines
arch/arm64/boot/dts/qcom/sc7180.dtsi +4 -0
  				gpuss1_crit: gpuss1_crit {
@@ -3864,6 +3873,13 @@
  					type = "critical";
  				};
  			};
+
+			cooling-maps {
+				map0 {
+					trip = <&gpuss0_alert0>;

Copy & paste error, this should be 'gpuss1_alert0'.

aah! you are correct.

--Akhil

Quoted 17 lines

arch/arm64/boot/dts/qcom/sc7180.dtsi line 3885

Quoted 7 lines
arch/arm64/boot/dts/qcom/sc7180.dtsi +3 -0
+					cooling-device = <&gpu THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+				};
+			};
  		};
 
  		aoss1-thermal {

Other than the C&P error:

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#4 lore raw

PATCH v3 3/3 dt-bindings: drm/msm/gpu: Add cooling device support

In reply to Akhil P Oommen

Add cooling device support to gpu. A cooling device is bound to a thermal zone to allow thermal mitigation.

---
 Documentation/devicetree/bindings/display/msm/gpu.txt | 7 +++++++
 1 file changed, 7 insertions(+)
Documentation/devicetree/bindings/display/msm/gpu.txt +7 -0
index 1af0ff1..090dcb3 100644
@@ -39,6 +39,10 @@ Required properties:
         a4xx Snapdragon SoCs. See
         Documentation/devicetree/bindings/sram/qcom,ocmem.yaml.
 
+Optional properties:
+- #cooling-cells: The value must be 2. For details, please refer
+	Documentation/devicetree/bindings/thermal/thermal-cooling-devices.yaml.
+
 Example 3xx/4xx:
 
 / {
@@ -61,6 +65,7 @@ Example 3xx/4xx:
 		power-domains = <&mmcc OXILICX_GDSC>;
 		operating-points-v2 = <&gpu_opp_table>;
 		iommus = <&gpu_iommu 0>;
+		#cooling-cells = <2>;
 	};
 
 	gpu_sram: ocmem@fdd00000 {
@@ -98,6 +103,8 @@ Example a6xx (with GMU):
 		reg = <0x5000000 0x40000>, <0x509e000 0x10>;
 		reg-names = "kgsl_3d0_reg_memory", "cx_mem";
 
+		#cooling-cells = <2>;
+
 		/*
 		 * Look ma, no clocks! The GPU clocks and power are
 		 * controlled entirely by the GMU
Signature · 6 lines
2.7.4

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Reviewed-by on v3 3/3
#5 lore raw

Re: [v3,3/3] dt-bindings: drm/msm/gpu: Add cooling device support

Quoted 32 lines · Akhil P Oommen

Add cooling device support to gpu. A cooling device is bound to a thermal zone to allow thermal mitigation.

---
 Documentation/devicetree/bindings/display/msm/gpu.txt | 7 +++++++
 1 file changed, 7 insertions(+)
Documentation/devicetree/bindings/display/msm/gpu.txt +5 -0
index 1af0ff1..090dcb3 100644
@@ -39,6 +39,10 @@ Required properties:
         a4xx Snapdragon SoCs. See
         Documentation/devicetree/bindings/sram/qcom,ocmem.yaml.
 
+Optional properties:
+- #cooling-cells: The value must be 2. For details, please refer
+	Documentation/devicetree/bindings/thermal/thermal-cooling-devices.yaml.
+
 Example 3xx/4xx:
 
 / {
@@ -61,6 +65,7 @@ Example 3xx/4xx:
 		power-domains = <&mmcc OXILICX_GDSC>;
 		operating-points-v2 = <&gpu_opp_table>;
 		iommus = <&gpu_iommu 0>;
+		#cooling-cells = <2>;
 	};
 
 	gpu_sram: ocmem@fdd00000 {

Documentation/devicetree/bindings/display/msm/gpu.txt Example a6xx (with GMU): · line 110

Quoted 8 lines
Documentation/devicetree/bindings/display/msm/gpu.txt +2 -0
@@ -98,6 +103,8 @@ Example a6xx (with GMU):
 		reg = <0x5000000 0x40000>, <0x509e000 0x10>;
 		reg-names = "kgsl_3d0_reg_memory", "cx_mem";
 
+		#cooling-cells = <2>;
+
 		/*
 		 * Look ma, no clocks! The GPU clocks and power are
 		 * controlled entirely by the GMU

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel