Merge "Revert^2 "thermal: Update cdev ceiling to match latest EM table"" into main

This commit is contained in:
Ramya Subramanian 2024-01-24 16:22:14 +00:00 committed by Android (Google) Code Review
commit 52b4354c2b
3 changed files with 51 additions and 51 deletions

View file

@ -264,7 +264,7 @@
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"BindedPowerRail": "S4M_VDD_CPUCL0",
"CdevCeiling": [0, 2, 2, 2, 2, 2, 2]
"CdevCeiling": [0, 4, 4, 4, 4, 4, 4]
},
{
"CdevRequest": "thermal-cpufreq-1",
@ -272,7 +272,7 @@
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"BindedPowerRail": "S2M_VDD_CPUCL1",
"CdevCeiling": [0, 6, 6, 6, 6, 6, 6]
"CdevCeiling": [0, 8, 8, 8, 8, 8, 8]
},
{
"CdevRequest": "thermal-cpufreq-2",
@ -280,7 +280,7 @@
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"BindedPowerRail": "S3M_VDD_CPUCL2",
"CdevCeiling": [0, 8, 8, 8, 8, 8, 8]
"CdevCeiling": [0, 12, 12, 12, 12, 12, 12]
}
]
},
@ -315,21 +315,21 @@
"CdevWeightForPID": [0.292, 0.292, 0.292, 0.292, 0.292, 0.292, 0.292],
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"CdevCeiling": [0, 6, 6, 6, 6, 6, 6]
"CdevCeiling": [0, 8, 8, 8, 8, 8, 8]
},
{
"CdevRequest": "thermal-cpufreq-1",
"CdevWeightForPID": [0.804, 0.804, 0.804, 0.804, 0.804, 0.804, 0.804],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 9, 9, 9, 9, 9, 9]
"CdevCeiling": [0, 11, 11, 11, 11, 11, 11]
},
{
"CdevRequest": "thermal-cpufreq-2",
"CdevWeightForPID": [0.342, 0.342, 0.342, 0.342, 0.342, 0.342, 0.342],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 12, 12, 12, 12, 12, 12]
"CdevCeiling": [0, 16, 16, 16, 16, 16, 16]
}
],
"Profile": [
@ -406,21 +406,21 @@
"CdevWeightForPID": [0.156, 0.156, 0.156, 0.156, 0.156, 0.156, 0.156],
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"CdevCeiling": [0, 8, 8, 8, 8, 8, 8]
"CdevCeiling": [0, 10, 10, 10, 10, 10, 10]
},
{
"CdevRequest": "thermal-cpufreq-1",
"CdevWeightForPID": [0.428, 0.428, 0.428, 0.428, 0.428, 0.428, 0.428],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 11, 11, 11, 11, 11, 11]
"CdevCeiling": [0, 14, 14, 14, 14, 14, 14]
},
{
"CdevRequest": "thermal-cpufreq-2",
"CdevWeightForPID": [0.225, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 13, 13, 13, 13, 13, 13]
"CdevCeiling": [0, 17, 17, 17, 17, 17, 17]
}
],
"Profile": [
@ -452,14 +452,14 @@
"CdevWeightForPID": [0.156, 0.156, 0.156, 0.156, 0.156, 0.156, 0.156],
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"CdevCeiling": [0, 6, 6, 6, 6, 6, 6]
"CdevCeiling": [0, 4, 4, 4, 4, 4, 4]
},
{
"CdevRequest": "thermal-cpufreq-1",
"CdevWeightForPID": [0.428, 0.428, 0.428, 0.428, 0.428, 0.428, 0.428],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 9, 9, 9, 9, 9, 9]
"CdevCeiling": [0, 8, 8, 8, 8, 8, 8]
},
{
"CdevRequest": "thermal-cpufreq-2",
@ -504,8 +504,8 @@
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"BindedPowerRail": "S4M_VDD_CPUCL0",
"CdevCeiling": [0, 8, 8, 8, 8, 9, 9],
"LimitInfo": [0, 0, 0, 0, 0, 9, 9]
"CdevCeiling": [0, 10, 10, 10, 10, 11, 11],
"LimitInfo": [0, 0, 0, 0, 0, 11, 11]
},
{
"CdevRequest": "thermal-cpufreq-1",
@ -513,8 +513,8 @@
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"BindedPowerRail": "S2M_VDD_CPUCL1",
"CdevCeiling": [0, 11, 11, 11, 11, 14, 14],
"LimitInfo": [0, 0, 0, 0, 0, 14, 14]
"CdevCeiling": [0, 14, 14, 14, 14, 16, 16],
"LimitInfo": [0, 0, 0, 0, 0, 16, 16]
},
{
"CdevRequest": "thermal-cpufreq-2",
@ -522,8 +522,8 @@
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"BindedPowerRail": "S3M_VDD_CPUCL2",
"CdevCeiling": [0, 13, 13, 13, 13, 14, 14],
"LimitInfo": [0, 0, 0, 0, 0, 14, 14]
"CdevCeiling": [0, 17, 17, 17, 17, 17, 17],
"LimitInfo": [0, 0, 0, 0, 0, 17, 17]
},
{
"CdevRequest": "thermal-gpufreq-0",

View file

@ -253,7 +253,7 @@
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"BindedPowerRail": "S4M_VDD_CPUCL0",
"CdevCeiling": [0, 2, 2, 2, 2, 2, 2]
"CdevCeiling": [0, 4, 4, 4, 4, 4, 4]
},
{
"CdevRequest": "thermal-cpufreq-1",
@ -261,7 +261,7 @@
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"BindedPowerRail": "S2M_VDD_CPUCL1",
"CdevCeiling": [0, 6, 6, 6, 6, 6, 6]
"CdevCeiling": [0, 8, 8, 8, 8, 8, 8]
},
{
"CdevRequest": "thermal-cpufreq-2",
@ -269,7 +269,7 @@
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"BindedPowerRail": "S3M_VDD_CPUCL2",
"CdevCeiling": [0, 8, 8, 8, 8, 8, 8]
"CdevCeiling": [0, 12, 12, 12, 12, 12, 12]
}
]
},
@ -304,21 +304,21 @@
"CdevWeightForPID": [0.292, 0.292, 0.292, 0.292, 0.292, 0.292, 0.292],
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"CdevCeiling": [0, 6, 6, 6, 6, 6, 6]
"CdevCeiling": [0, 8, 8, 8, 8, 8, 8]
},
{
"CdevRequest": "thermal-cpufreq-1",
"CdevWeightForPID": [0.804, 0.804, 0.804, 0.804, 0.804, 0.804, 0.804],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 9, 9, 9, 9, 9, 9]
"CdevCeiling": [0, 11, 11, 11, 11, 11, 11]
},
{
"CdevRequest": "thermal-cpufreq-2",
"CdevWeightForPID": [0.342, 0.342, 0.342, 0.342, 0.342, 0.342, 0.342],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 12, 12, 12, 12, 12, 12]
"CdevCeiling": [0, 16, 16, 16, 16, 16, 16]
}
],
"Profile": [
@ -395,21 +395,21 @@
"CdevWeightForPID": [0.156, 0.156, 0.156, 0.156, 0.156, 0.156, 0.156],
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"CdevCeiling": [0, 8, 8, 8, 8, 8, 8]
"CdevCeiling": [0, 10, 10, 10, 10, 10, 10]
},
{
"CdevRequest": "thermal-cpufreq-1",
"CdevWeightForPID": [0.428, 0.428, 0.428, 0.428, 0.428, 0.428, 0.428],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 11, 11, 11, 11, 11, 11]
"CdevCeiling": [0, 14, 14, 14, 14, 14, 14]
},
{
"CdevRequest": "thermal-cpufreq-2",
"CdevWeightForPID": [0.225, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 13, 13, 13, 13, 13, 13]
"CdevCeiling": [0, 17, 17, 17, 17, 17, 17]
}
],
"Profile": [
@ -441,14 +441,14 @@
"CdevWeightForPID": [0.156, 0.156, 0.156, 0.156, 0.156, 0.156, 0.156],
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"CdevCeiling": [0, 6, 6, 6, 6, 6, 6]
"CdevCeiling": [0, 4, 4, 4, 4, 4, 4]
},
{
"CdevRequest": "thermal-cpufreq-1",
"CdevWeightForPID": [0.428, 0.428, 0.428, 0.428, 0.428, 0.428, 0.428],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 9, 9, 9, 9, 9, 9]
"CdevCeiling": [0, 8, 8, 8, 8, 8, 8]
},
{
"CdevRequest": "thermal-cpufreq-2",
@ -493,8 +493,8 @@
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"BindedPowerRail": "S4M_VDD_CPUCL0",
"CdevCeiling": [0, 8, 8, 8, 8, 9, 9],
"LimitInfo": [0, 0, 0, 0, 0, 9, 9]
"CdevCeiling": [0, 10, 10, 10, 10, 11, 11],
"LimitInfo": [0, 0, 0, 0, 0, 11, 11]
},
{
"CdevRequest": "thermal-cpufreq-1",
@ -502,8 +502,8 @@
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"BindedPowerRail": "S2M_VDD_CPUCL1",
"CdevCeiling": [0, 11, 11, 11, 11, 14, 14],
"LimitInfo": [0, 0, 0, 0, 0, 14, 14]
"CdevCeiling": [0, 14, 14, 14, 14, 16, 16],
"LimitInfo": [0, 0, 0, 0, 0, 16, 16]
},
{
"CdevRequest": "thermal-cpufreq-2",
@ -511,8 +511,8 @@
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"BindedPowerRail": "S3M_VDD_CPUCL2",
"CdevCeiling": [0, 13, 13, 13, 13, 14, 14],
"LimitInfo": [0, 0, 0, 0, 0, 14, 14]
"CdevCeiling": [0, 17, 17, 17, 17, 17, 17],
"LimitInfo": [0, 0, 0, 0, 0, 17, 17]
},
{
"CdevRequest": "thermal-gpufreq-0",

View file

@ -243,7 +243,7 @@
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"BindedPowerRail": "S4M_VDD_CPUCL0",
"CdevCeiling": [0, 2, 2, 2, 2, 2, 2]
"CdevCeiling": [0, 4, 4, 4, 4, 4, 4]
},
{
"CdevRequest": "thermal-cpufreq-1",
@ -251,7 +251,7 @@
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"BindedPowerRail": "S2M_VDD_CPUCL1",
"CdevCeiling": [0, 6, 6, 6, 6, 6, 6]
"CdevCeiling": [0, 8, 8, 8, 8, 8, 8]
},
{
"CdevRequest": "thermal-cpufreq-2",
@ -259,7 +259,7 @@
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"BindedPowerRail": "S3M_VDD_CPUCL2",
"CdevCeiling": [0, 8, 8, 8, 8, 8, 8]
"CdevCeiling": [0, 12, 12, 12, 12, 12, 12]
}
]
},
@ -294,21 +294,21 @@
"CdevWeightForPID": [0.292, 0.292, 0.292, 0.292, 0.292, 0.292, 0.292],
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"CdevCeiling": [0, 6, 6, 6, 6, 6, 6]
"CdevCeiling": [0, 8, 8, 8, 8, 8, 8]
},
{
"CdevRequest": "thermal-cpufreq-1",
"CdevWeightForPID": [0.804, 0.804, 0.804, 0.804, 0.804, 0.804, 0.804],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 9, 9, 9, 9, 9, 9]
"CdevCeiling": [0, 11, 11, 11, 11, 11, 11]
},
{
"CdevRequest": "thermal-cpufreq-2",
"CdevWeightForPID": [0.342, 0.342, 0.342, 0.342, 0.342, 0.342, 0.342],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 12, 12, 12, 12, 12, 12]
"CdevCeiling": [0, 16, 16, 16, 16, 16, 16]
}
],
"Profile": [
@ -385,21 +385,21 @@
"CdevWeightForPID": [0.156, 0.156, 0.156, 0.156, 0.156, 0.156, 0.156],
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"CdevCeiling": [0, 8, 8, 8, 8, 8, 8]
"CdevCeiling": [0, 10, 10, 10, 10, 10, 10]
},
{
"CdevRequest": "thermal-cpufreq-1",
"CdevWeightForPID": [0.428, 0.428, 0.428, 0.428, 0.428, 0.428, 0.428],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 11, 11, 11, 11, 11, 11]
"CdevCeiling": [0, 14, 14, 14, 14, 14, 14]
},
{
"CdevRequest": "thermal-cpufreq-2",
"CdevWeightForPID": [0.225, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 13, 13, 13, 13, 13, 13]
"CdevCeiling": [0, 17, 17, 17, 17, 17, 17]
}
],
"Profile": [
@ -431,14 +431,14 @@
"CdevWeightForPID": [0.156, 0.156, 0.156, 0.156, 0.156, 0.156, 0.156],
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"CdevCeiling": [0, 6, 6, 6, 6, 6, 6]
"CdevCeiling": [0, 4, 4, 4, 4, 4, 4]
},
{
"CdevRequest": "thermal-cpufreq-1",
"CdevWeightForPID": [0.428, 0.428, 0.428, 0.428, 0.428, 0.428, 0.428],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 9, 9, 9, 9, 9, 9]
"CdevCeiling": [0, 8, 8, 8, 8, 8, 8]
},
{
"CdevRequest": "thermal-cpufreq-2",
@ -483,8 +483,8 @@
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"BindedPowerRail": "S4M_VDD_CPUCL0",
"CdevCeiling": [0, 8, 8, 8, 8, 9, 9],
"LimitInfo": [0, 0, 0, 0, 0, 9, 9]
"CdevCeiling": [0, 10, 10, 10, 10, 11, 11],
"LimitInfo": [0, 0, 0, 0, 0, 11, 11]
},
{
"CdevRequest": "thermal-cpufreq-1",
@ -492,8 +492,8 @@
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"BindedPowerRail": "S2M_VDD_CPUCL1",
"CdevCeiling": [0, 11, 11, 11, 11, 14, 14],
"LimitInfo": [0, 0, 0, 0, 0, 14, 14]
"CdevCeiling": [0, 14, 14, 14, 14, 16, 16],
"LimitInfo": [0, 0, 0, 0, 0, 16, 16]
},
{
"CdevRequest": "thermal-cpufreq-2",
@ -501,8 +501,8 @@
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"BindedPowerRail": "S3M_VDD_CPUCL2",
"CdevCeiling": [0, 13, 13, 13, 13, 14, 14],
"LimitInfo": [0, 0, 0, 0, 0, 14, 14]
"CdevCeiling": [0, 17, 17, 17, 17, 17, 17],
"LimitInfo": [0, 0, 0, 0, 0, 17, 17]
},
{
"CdevRequest": "thermal-gpufreq-0",