powerhint: remove the duplicate thermal powerhint settings am: 3e74bb58d8 am: 206418476c

Original change: https://googleplex-android-review.googlesource.com/c/device/google/tangorpro/+/23717052

Change-Id: I750aa388e1c44467173a8272a1656cad59f21b29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TeYuan Wang 2023-06-28 08:55:40 +00:00 committed by Automerger Merge Worker
commit 90aaef855d

View file

@ -1608,72 +1608,6 @@
"Duration": 0, "Duration": 0,
"Value": "0" "Value": "0"
}, },
{
"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": "TpuControlTempSet",
"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": "TpuSwitchOnTempSet",
"Duration": 0,
"Value": "60000"
},
{ {
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
"Node": "Dex2oatThreads", "Node": "Dex2oatThreads",
@ -1686,186 +1620,12 @@
"Duration": 0, "Duration": 0,
"Value": "0,1,2,3" "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": "TpuControlTempSet",
"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": "TpuSwitchOnTempSet",
"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": "TpuControlTempSet",
"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": "TpuSwitchOnTempSet",
"Duration": 0,
"Value": "60000"
},
{ {
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
"Node": "Dex2oatThreads", "Node": "Dex2oatThreads",
"Duration": 0, "Duration": 0,
"Value": "2" "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", "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
"Node": "CPU_LITTLE_TSKIN_BYPASS", "Node": "CPU_LITTLE_TSKIN_BYPASS",
@ -1884,84 +1644,12 @@
"Duration": 0, "Duration": 0,
"Value": "0" "Value": "0"
}, },
{
"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": "TpuControlTempSet",
"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": "TpuSwitchOnTempSet",
"Duration": 0,
"Value": "60000"
},
{ {
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
"Node": "Dex2oatThreads", "Node": "Dex2oatThreads",
"Duration": 0, "Duration": 0,
"Value": "1" "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": "FP_BOOST", "PowerHint": "FP_BOOST",
"Node": "CPUBigClusterMaxFreq", "Node": "CPUBigClusterMaxFreq",