Merge "powerhint: remove the duplicate thermal powerhint settings" into udc-qpr-dev am: 4b96f59213

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

Change-Id: I093b21a89653a9282b0a224f1e799cffc0955723
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Kame(TeYuan) Wang 2023-06-28 08:15:42 +00:00 committed by Automerger Merge Worker
commit d853bef2ee

View file

@ -1541,60 +1541,6 @@
"Duration": 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": "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",
@ -1607,162 +1553,12 @@
"Duration": 0,
"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_CRITICAL",
"Node": "PMU_POLL",
"Duration": 0,
"Value": "1"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
"Node": "Dex2oatGroup",
"Duration": 0,
"Value": "0"
},
{
"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",
@ -1781,72 +1577,12 @@
"Duration": 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": "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",