powerhint: remove the duplicate thermal powerhint settings
For the current design, thermalHAL will only enable one hint base on the current severity and disable the previous one. As a result, the power hint of higher severity should maintain the actions from lower severity which cause the larger config size and maintenance effort.
The new thermalHAL design will keep the lower severity's hint enabled, so we could remove the duplicate policies from higher level.
Bug: 241737737
Test: verified Raven with emul_temp
Change-Id: I51bf72997e0d85baa419e890453838f882b64f50
diff --git a/powerhint-oriole.json b/powerhint-oriole.json
index 41de22a..1eeb205 100644
--- a/powerhint-oriole.json
+++ b/powerhint-oriole.json
@@ -1450,60 +1450,6 @@
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
- "Node": "PMU_POLL",
- "Duration": 0,
- "Value": "1"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
- "Node": "BigControlTempSet",
- "Duration": 0,
- "Value": "80000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
- "Node": "MidControlTempSet",
- "Duration": 0,
- "Value": "80000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
- "Node": "LittleControlTempSet",
- "Duration": 0,
- "Value": "80000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
- "Node": "G3dControlTempSet",
- "Duration": 0,
- "Value": "80000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
- "Node": "BigSwitchOnTempSet",
- "Duration": 0,
- "Value": "60000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
- "Node": "MidSwitchOnTempSet",
- "Duration": 0,
- "Value": "60000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
- "Node": "LittleSwitchOnTempSet",
- "Duration": 0,
- "Value": "60000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
- "Node": "G3dSwitchOnTempSet",
- "Duration": 0,
- "Value": "60000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
"Node": "Dex2oatThreads",
"Duration": 0,
"Value": "4"
@@ -1515,162 +1461,12 @@
"Value": "0,1,2,3"
},
{
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
- "Node": "Dex2oatGroup",
- "Duration": 0,
- "Value": "0"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
- "Node": "PMU_POLL",
- "Duration": 0,
- "Value": "1"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
- "Node": "BigControlTempSet",
- "Duration": 0,
- "Value": "80000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
- "Node": "MidControlTempSet",
- "Duration": 0,
- "Value": "80000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
- "Node": "LittleControlTempSet",
- "Duration": 0,
- "Value": "80000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
- "Node": "G3dControlTempSet",
- "Duration": 0,
- "Value": "80000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
- "Node": "BigSwitchOnTempSet",
- "Duration": 0,
- "Value": "60000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
- "Node": "MidSwitchOnTempSet",
- "Duration": 0,
- "Value": "60000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
- "Node": "LittleSwitchOnTempSet",
- "Duration": 0,
- "Value": "60000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
- "Node": "G3dSwitchOnTempSet",
- "Duration": 0,
- "Value": "60000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
- "Node": "Dex2oatThreads",
- "Duration": 0,
- "Value": "4"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
- "Node": "Dex2oatCPUSet",
- "Duration": 0,
- "Value": "0,1,2,3"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
- "Node": "Dex2oatGroup",
- "Duration": 0,
- "Value": "0"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
- "Node": "PMU_POLL",
- "Duration": 0,
- "Value": "1"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
- "Node": "BigControlTempSet",
- "Duration": 0,
- "Value": "80000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
- "Node": "MidControlTempSet",
- "Duration": 0,
- "Value": "80000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
- "Node": "LittleControlTempSet",
- "Duration": 0,
- "Value": "80000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
- "Node": "G3dControlTempSet",
- "Duration": 0,
- "Value": "80000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
- "Node": "BigSwitchOnTempSet",
- "Duration": 0,
- "Value": "60000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
- "Node": "MidSwitchOnTempSet",
- "Duration": 0,
- "Value": "60000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
- "Node": "LittleSwitchOnTempSet",
- "Duration": 0,
- "Value": "60000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
- "Node": "G3dSwitchOnTempSet",
- "Duration": 0,
- "Value": "60000"
- },
- {
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
"Node": "Dex2oatThreads",
"Duration": 0,
"Value": "2"
},
{
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
- "Node": "Dex2oatCPUSet",
- "Duration": 0,
- "Value": "0,1,2,3"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
- "Node": "Dex2oatGroup",
- "Duration": 0,
- "Value": "0"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
- "Node": "PMU_POLL",
- "Duration": 0,
- "Value": "1"
- },
- {
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
"Node": "CPU_LITTLE_TSKIN_BYPASS",
"Duration": 0,
@@ -1690,71 +1486,11 @@
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
- "Node": "BigControlTempSet",
- "Duration": 0,
- "Value": "80000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
- "Node": "MidControlTempSet",
- "Duration": 0,
- "Value": "80000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
- "Node": "LittleControlTempSet",
- "Duration": 0,
- "Value": "80000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
- "Node": "G3dControlTempSet",
- "Duration": 0,
- "Value": "80000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
- "Node": "BigSwitchOnTempSet",
- "Duration": 0,
- "Value": "60000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
- "Node": "MidSwitchOnTempSet",
- "Duration": 0,
- "Value": "60000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
- "Node": "LittleSwitchOnTempSet",
- "Duration": 0,
- "Value": "60000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
- "Node": "G3dSwitchOnTempSet",
- "Duration": 0,
- "Value": "60000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
"Node": "Dex2oatThreads",
"Duration": 0,
"Value": "1"
},
{
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
- "Node": "Dex2oatCPUSet",
- "Duration": 0,
- "Value": "0,1,2,3"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
- "Node": "Dex2oatGroup",
- "Duration": 0,
- "Value": "0"
- },
- {
"PowerHint": "FACE_UNLOCK_BOOST",
"Node": "CPU_LITTLE_TSKIN_BYPASS",
"Duration": 1000,
diff --git a/powerhint-raven.json b/powerhint-raven.json
index 82fc9f4..59faed3 100644
--- a/powerhint-raven.json
+++ b/powerhint-raven.json
@@ -1431,60 +1431,6 @@
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
- "Node": "PMU_POLL",
- "Duration": 0,
- "Value": "1"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
- "Node": "BigControlTempSet",
- "Duration": 0,
- "Value": "80000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
- "Node": "MidControlTempSet",
- "Duration": 0,
- "Value": "80000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
- "Node": "LittleControlTempSet",
- "Duration": 0,
- "Value": "80000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
- "Node": "G3dControlTempSet",
- "Duration": 0,
- "Value": "80000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
- "Node": "BigSwitchOnTempSet",
- "Duration": 0,
- "Value": "60000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
- "Node": "MidSwitchOnTempSet",
- "Duration": 0,
- "Value": "60000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
- "Node": "LittleSwitchOnTempSet",
- "Duration": 0,
- "Value": "60000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
- "Node": "G3dSwitchOnTempSet",
- "Duration": 0,
- "Value": "60000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
"Node": "Dex2oatThreads",
"Duration": 0,
"Value": "4"
@@ -1496,162 +1442,12 @@
"Value": "0,1,2,3"
},
{
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
- "Node": "Dex2oatGroup",
- "Duration": 0,
- "Value": "0"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
- "Node": "PMU_POLL",
- "Duration": 0,
- "Value": "1"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
- "Node": "BigControlTempSet",
- "Duration": 0,
- "Value": "80000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
- "Node": "MidControlTempSet",
- "Duration": 0,
- "Value": "80000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
- "Node": "LittleControlTempSet",
- "Duration": 0,
- "Value": "80000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
- "Node": "G3dControlTempSet",
- "Duration": 0,
- "Value": "80000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
- "Node": "BigSwitchOnTempSet",
- "Duration": 0,
- "Value": "60000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
- "Node": "MidSwitchOnTempSet",
- "Duration": 0,
- "Value": "60000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
- "Node": "LittleSwitchOnTempSet",
- "Duration": 0,
- "Value": "60000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
- "Node": "G3dSwitchOnTempSet",
- "Duration": 0,
- "Value": "60000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
- "Node": "Dex2oatThreads",
- "Duration": 0,
- "Value": "4"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
- "Node": "Dex2oatCPUSet",
- "Duration": 0,
- "Value": "0,1,2,3"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
- "Node": "Dex2oatGroup",
- "Duration": 0,
- "Value": "0"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
- "Node": "PMU_POLL",
- "Duration": 0,
- "Value": "1"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
- "Node": "BigControlTempSet",
- "Duration": 0,
- "Value": "80000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
- "Node": "MidControlTempSet",
- "Duration": 0,
- "Value": "80000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
- "Node": "LittleControlTempSet",
- "Duration": 0,
- "Value": "80000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
- "Node": "G3dControlTempSet",
- "Duration": 0,
- "Value": "80000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
- "Node": "BigSwitchOnTempSet",
- "Duration": 0,
- "Value": "60000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
- "Node": "MidSwitchOnTempSet",
- "Duration": 0,
- "Value": "60000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
- "Node": "LittleSwitchOnTempSet",
- "Duration": 0,
- "Value": "60000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
- "Node": "G3dSwitchOnTempSet",
- "Duration": 0,
- "Value": "60000"
- },
- {
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
"Node": "Dex2oatThreads",
"Duration": 0,
"Value": "2"
},
{
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
- "Node": "Dex2oatCPUSet",
- "Duration": 0,
- "Value": "0,1,2,3"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
- "Node": "Dex2oatGroup",
- "Duration": 0,
- "Value": "0"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
- "Node": "PMU_POLL",
- "Duration": 0,
- "Value": "1"
- },
- {
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
"Node": "CPU_LITTLE_TSKIN_BYPASS",
"Duration": 0,
@@ -1671,71 +1467,11 @@
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
- "Node": "BigControlTempSet",
- "Duration": 0,
- "Value": "80000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
- "Node": "MidControlTempSet",
- "Duration": 0,
- "Value": "80000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
- "Node": "LittleControlTempSet",
- "Duration": 0,
- "Value": "80000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
- "Node": "G3dControlTempSet",
- "Duration": 0,
- "Value": "80000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
- "Node": "BigSwitchOnTempSet",
- "Duration": 0,
- "Value": "60000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
- "Node": "MidSwitchOnTempSet",
- "Duration": 0,
- "Value": "60000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
- "Node": "LittleSwitchOnTempSet",
- "Duration": 0,
- "Value": "60000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
- "Node": "G3dSwitchOnTempSet",
- "Duration": 0,
- "Value": "60000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
"Node": "Dex2oatThreads",
"Duration": 0,
"Value": "1"
},
{
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
- "Node": "Dex2oatCPUSet",
- "Duration": 0,
- "Value": "0,1,2,3"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
- "Node": "Dex2oatGroup",
- "Duration": 0,
- "Value": "0"
- },
- {
"PowerHint": "FACE_UNLOCK_BOOST",
"Node": "CPU_LITTLE_TSKIN_BYPASS",
"Duration": 1000,