thermal: optimize CPU/GPU throttling
Bug: 195459720
Test: test burn8 and manhattan
Change-Id: Icb65cda2f9370069ac701cc1d15c6cc8661af0ba
diff --git a/thermal_info_config_oriole.json b/thermal_info_config_oriole.json
index 945ac4a..03b34f5 100644
--- a/thermal_info_config_oriole.json
+++ b/thermal_info_config_oriole.json
@@ -330,17 +330,17 @@
"K_Pu":["NAN", "NAN", 1500, 1500, "NAN", "NAN", "NAN"],
"K_I":["NAN", "NAN", 20, 20, "NAN", "NAN", "NAN"],
"K_D":["NAN", "NAN", 10, 10, "NAN", "NAN", "NAN"],
- "I_Max":["NAN", "NAN", 4000, 4000, "NAN", "NAN", "NAN"],
- "S_Power":["NAN", "NAN", 5000, 3500, "NAN", "NAN", "NAN"],
- "MinAllocPower":["NAN", "NAN", 2000, 2000, "NAN", "NAN", "NAN"],
- "MaxAllocPower":["NAN", "NAN", 9500, 6500, "NAN", "NAN", "NAN"],
+ "I_Max":["NAN", "NAN", 4000, 1000, "NAN", "NAN", "NAN"],
+ "S_Power":["NAN", "NAN", 3500, 1500, "NAN", "NAN", "NAN"],
+ "MinAllocPower":["NAN", "NAN", 2500, 1500, "NAN", "NAN", "NAN"],
+ "MaxAllocPower":["NAN", "NAN", 9500, 3000, "NAN", "NAN", "NAN"],
"I_Cutoff":["NAN", "NAN", 2, 2, "NAN", "NAN", "NAN"]
},
"BindedCdevInfo": [
{
"CdevRequest": "thermal-cpufreq-0",
- "CdevWeightForPID": [0.9, 0.9, 0.9, 0.9, 0.9, 0.9, 0.9],
- "CdevCeiling": [6, 6, 6, 7, 8, 10, 10],
+ "CdevWeightForPID": [0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1],
+ "CdevCeiling": [3, 3, 6, 7, 8, 10, 10],
"LimitInfo": [0, 0, 0, 0, 8, 10, 10],
"BindedPowerRail": "S4M_VDD_CPUCL0",
"PowerThreshold": [200, 200, 200, 200, 50, 0, 0],
@@ -348,8 +348,8 @@
},
{
"CdevRequest": "thermal-cpufreq-1",
- "CdevWeightForPID": [1.1, 1.1, 1.1, 1.1, 1.1, 1.1, 1.1],
- "CdevCeiling": [9, 9, 9, 10, 11, 13, 13],
+ "CdevWeightForPID": [0.075, 0.075, 0.075, 0.075, 0.075, 0.075, 0.075],
+ "CdevCeiling": [7, 7, 8, 9, 11, 13, 13],
"LimitInfo": [0, 0, 0, 0, 11, 13, 13],
"BindedPowerRail": "S3M_VDD_CPUCL1",
"PowerThreshold": [200, 200, 200, 200, 50, 0, 0],
@@ -357,8 +357,8 @@
},
{
"CdevRequest": "thermal-cpufreq-2",
- "CdevWeightForPID": [2.9, 2.9, 2.9, 2.9, 2.9, 2.9, 2.9],
- "CdevCeiling": [12, 12, 12, 13, 14, 16, 16],
+ "CdevWeightForPID": [0.37, 0.37, 0.37, 0.37, 0.37, 0.37, 0.37],
+ "CdevCeiling": [11, 11, 14, 14, 14, 16, 16],
"LimitInfo": [0, 0, 0, 0, 14, 16, 16],
"BindedPowerRail": "S2M_VDD_CPUCL2",
"PowerThreshold": [200, 200, 200, 200, 50, 0, 0],
@@ -366,8 +366,8 @@
},
{
"CdevRequest": "thermal-gpufreq-0",
- "CdevWeightForPID": [3.3, 3.3, 3.3, 3.3, 3.3, 3.3, 3.3],
- "CdevCeiling": [7, 7, 7, 8, 10, 11, 11],
+ "CdevWeightForPID": [0.455, 0.455, 0.455, 0.455, 0.455, 0.455, 0.455],
+ "CdevCeiling": [7, 7, 8, 9, 10, 11, 11],
"LimitInfo": [0, 0, 0, 0, 10, 11, 11],
"BindedPowerRail": "S2S_VDD_G3D",
"PowerThreshold": [200, 200, 200, 200, 50, 0, 0],
diff --git a/thermal_info_config_raven.json b/thermal_info_config_raven.json
index f73ade1..2025978 100644
--- a/thermal_info_config_raven.json
+++ b/thermal_info_config_raven.json
@@ -330,17 +330,17 @@
"K_Pu":["NAN", "NAN", 1500, 1500, "NAN", "NAN", "NAN"],
"K_I":["NAN", "NAN", 20, 20, "NAN", "NAN", "NAN"],
"K_D":["NAN", "NAN", 10, 10, "NAN", "NAN", "NAN"],
- "I_Max":["NAN", "NAN", 4000, 4000, "NAN", "NAN", "NAN"],
- "S_Power":["NAN", "NAN", 5000, 3500, "NAN", "NAN", "NAN"],
- "MinAllocPower":["NAN", "NAN", 2000, 2000, "NAN", "NAN", "NAN"],
- "MaxAllocPower":["NAN", "NAN", 9500, 6500, "NAN", "NAN", "NAN"],
+ "I_Max":["NAN", "NAN", 4000, 1000, "NAN", "NAN", "NAN"],
+ "S_Power":["NAN", "NAN", 3500, 1500, "NAN", "NAN", "NAN"],
+ "MinAllocPower":["NAN", "NAN", 2500, 1500, "NAN", "NAN", "NAN"],
+ "MaxAllocPower":["NAN", "NAN", 9500, 3000, "NAN", "NAN", "NAN"],
"I_Cutoff":["NAN", "NAN", 2, 2, "NAN", "NAN", "NAN"]
},
"BindedCdevInfo": [
{
"CdevRequest": "thermal-cpufreq-0",
- "CdevWeightForPID": [0.9, 0.9, 0.9, 0.9, 0.9, 0.9, 0.9],
- "CdevCeiling": [6, 6, 6, 7, 8, 10, 10],
+ "CdevWeightForPID": [0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1],
+ "CdevCeiling": [3, 3, 6, 7, 8, 10, 10],
"LimitInfo": [0, 0, 0, 0, 8, 10, 10],
"BindedPowerRail": "S4M_VDD_CPUCL0",
"PowerThreshold": [200, 200, 200, 200, 50, 0, 0],
@@ -348,8 +348,8 @@
},
{
"CdevRequest": "thermal-cpufreq-1",
- "CdevWeightForPID": [1.1, 1.1, 1.1, 1.1, 1.1, 1.1, 1.1],
- "CdevCeiling": [9, 9, 9, 10, 11, 13, 13],
+ "CdevWeightForPID": [0.075, 0.075, 0.075, 0.075, 0.075, 0.075, 0.075],
+ "CdevCeiling": [7, 7, 8, 9, 11, 13, 13],
"LimitInfo": [0, 0, 0, 0, 11, 13, 13],
"BindedPowerRail": "S3M_VDD_CPUCL1",
"PowerThreshold": [200, 200, 200, 200, 50, 0, 0],
@@ -357,8 +357,8 @@
},
{
"CdevRequest": "thermal-cpufreq-2",
- "CdevWeightForPID": [2.9, 2.9, 2.9, 2.9, 2.9, 2.9, 2.9],
- "CdevCeiling": [12, 12, 12, 13, 14, 16, 16],
+ "CdevWeightForPID": [0.37, 0.37, 0.37, 0.37, 0.37, 0.37, 0.37],
+ "CdevCeiling": [11, 11, 14, 14, 14, 16, 16],
"LimitInfo": [0, 0, 0, 0, 14, 16, 16],
"BindedPowerRail": "S2M_VDD_CPUCL2",
"PowerThreshold": [200, 200, 200, 200, 50, 0, 0],
@@ -366,8 +366,8 @@
},
{
"CdevRequest": "thermal-gpufreq-0",
- "CdevWeightForPID": [3.3, 3.3, 3.3, 3.3, 3.3, 3.3, 3.3],
- "CdevCeiling": [7, 7, 7, 8, 10, 11, 11],
+ "CdevWeightForPID": [0.455, 0.455, 0.455, 0.455, 0.455, 0.455, 0.455],
+ "CdevCeiling": [7, 7, 8, 9, 10, 11, 11],
"LimitInfo": [0, 0, 0, 0, 10, 11, 11],
"BindedPowerRail": "S2S_VDD_G3D",
"PowerThreshold": [200, 200, 200, 200, 50, 0, 0],