Merge "Revert^2 "Set big core to cpu skip mask by default"" into 24D1-dev am: 1ae838086c
Original change: https://googleplex-android-review.googlesource.com/c/device/google/caimito/+/27232593 Change-Id: Ifcb474ab364936e79a89b661a8f9f6dd1ce3ce57 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
f0d17434a3
4 changed files with 144 additions and 4 deletions
|
@ -221,7 +221,6 @@
|
|||
"0x0",
|
||||
"0x80"
|
||||
],
|
||||
"DefaultIndex": 0,
|
||||
"ResetOnInit": true
|
||||
},
|
||||
{
|
||||
|
@ -845,6 +844,12 @@
|
|||
"Duration": 1000,
|
||||
"Value": "0-3"
|
||||
},
|
||||
{
|
||||
"PowerHint": "LAUNCH",
|
||||
"Node": "CPUSkipMask",
|
||||
"Duration": 5000,
|
||||
"Value": "0x0"
|
||||
},
|
||||
{
|
||||
"PowerHint": "LAUNCH",
|
||||
"Node": "ReducePreferIdle",
|
||||
|
@ -992,6 +997,12 @@
|
|||
"Duration": 5000,
|
||||
"Value": "1"
|
||||
},
|
||||
{
|
||||
"PowerHint": "LAUNCH_EXTEND",
|
||||
"Node": "CPUSkipMask",
|
||||
"Duration": 2000,
|
||||
"Value": "0x0"
|
||||
},
|
||||
{
|
||||
"PowerHint": "LAUNCH_EXTEND",
|
||||
"Node": "CPUBigClusterMaxFreq",
|
||||
|
@ -1266,6 +1277,12 @@
|
|||
"Duration": 0,
|
||||
"Value": "0"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_LAUNCH",
|
||||
"Node": "CPUSkipMask",
|
||||
"Duration": 1000,
|
||||
"Value": "0x0"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_LAUNCH",
|
||||
"Node": "CPU_BIG_TSKIN_BYPASS",
|
||||
|
@ -1842,6 +1859,12 @@
|
|||
"Duration": 0,
|
||||
"Value": "camera"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_STREAMING_EXTREME",
|
||||
"Node": "CPUSkipMask",
|
||||
"Duration": 0,
|
||||
"Value": "0x0"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_STREAMING_HIGH",
|
||||
"Node": "PowerHALCameraRunning",
|
||||
|
@ -2232,6 +2255,12 @@
|
|||
"Duration": 0,
|
||||
"Value": "4-7"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_STREAMING_LOW",
|
||||
"Node": "CPUSkipMask",
|
||||
"Duration": 0,
|
||||
"Value": "0x0"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
|
||||
"Node": "PowerHALCameraRunning",
|
||||
|
@ -2370,6 +2399,12 @@
|
|||
"Duration": 0,
|
||||
"Value": "30"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
|
||||
"Node": "CPUSkipMask",
|
||||
"Duration": 0,
|
||||
"Value": "0x0"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_VIDEO_RECORDING",
|
||||
"Type": "MaskHint",
|
||||
|
|
|
@ -221,7 +221,6 @@
|
|||
"0x0",
|
||||
"0x80"
|
||||
],
|
||||
"DefaultIndex": 0,
|
||||
"ResetOnInit": true
|
||||
},
|
||||
{
|
||||
|
@ -845,6 +844,12 @@
|
|||
"Duration": 1000,
|
||||
"Value": "0-3"
|
||||
},
|
||||
{
|
||||
"PowerHint": "LAUNCH",
|
||||
"Node": "CPUSkipMask",
|
||||
"Duration": 5000,
|
||||
"Value": "0x0"
|
||||
},
|
||||
{
|
||||
"PowerHint": "LAUNCH",
|
||||
"Node": "ReducePreferIdle",
|
||||
|
@ -992,6 +997,12 @@
|
|||
"Duration": 5000,
|
||||
"Value": "1"
|
||||
},
|
||||
{
|
||||
"PowerHint": "LAUNCH_EXTEND",
|
||||
"Node": "CPUSkipMask",
|
||||
"Duration": 2000,
|
||||
"Value": "0x0"
|
||||
},
|
||||
{
|
||||
"PowerHint": "LAUNCH_EXTEND",
|
||||
"Node": "CPUBigClusterMaxFreq",
|
||||
|
@ -1266,6 +1277,12 @@
|
|||
"Duration": 0,
|
||||
"Value": "0"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_LAUNCH",
|
||||
"Node": "CPUSkipMask",
|
||||
"Duration": 1000,
|
||||
"Value": "0x0"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_LAUNCH",
|
||||
"Node": "CPU_BIG_TSKIN_BYPASS",
|
||||
|
@ -1842,6 +1859,12 @@
|
|||
"Duration": 0,
|
||||
"Value": "camera"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_STREAMING_EXTREME",
|
||||
"Node": "CPUSkipMask",
|
||||
"Duration": 0,
|
||||
"Value": "0x0"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_STREAMING_HIGH",
|
||||
"Node": "PowerHALCameraRunning",
|
||||
|
@ -2232,6 +2255,12 @@
|
|||
"Duration": 0,
|
||||
"Value": "4-7"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_STREAMING_LOW",
|
||||
"Node": "CPUSkipMask",
|
||||
"Duration": 0,
|
||||
"Value": "0x0"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
|
||||
"Node": "PowerHALCameraRunning",
|
||||
|
@ -2370,6 +2399,12 @@
|
|||
"Duration": 0,
|
||||
"Value": "30"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
|
||||
"Node": "CPUSkipMask",
|
||||
"Duration": 0,
|
||||
"Value": "0x0"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_VIDEO_RECORDING",
|
||||
"Type": "MaskHint",
|
||||
|
|
|
@ -275,7 +275,6 @@
|
|||
"0x0",
|
||||
"0x80"
|
||||
],
|
||||
"DefaultIndex": 0,
|
||||
"ResetOnInit": true
|
||||
},
|
||||
{
|
||||
|
@ -834,6 +833,12 @@
|
|||
"Duration": 1000,
|
||||
"Value": "0-3"
|
||||
},
|
||||
{
|
||||
"PowerHint": "LAUNCH",
|
||||
"Node": "CPUSkipMask",
|
||||
"Duration": 5000,
|
||||
"Value": "0x0"
|
||||
},
|
||||
{
|
||||
"PowerHint": "LAUNCH",
|
||||
"Node": "ReducePreferIdle",
|
||||
|
@ -981,6 +986,12 @@
|
|||
"Duration": 5000,
|
||||
"Value": "1"
|
||||
},
|
||||
{
|
||||
"PowerHint": "LAUNCH_EXTEND",
|
||||
"Node": "CPUSkipMask",
|
||||
"Duration": 2000,
|
||||
"Value": "0x0"
|
||||
},
|
||||
{
|
||||
"PowerHint": "LAUNCH_EXTEND",
|
||||
"Node": "CPUBigClusterMaxFreq",
|
||||
|
@ -1255,6 +1266,12 @@
|
|||
"Duration": 0,
|
||||
"Value": "0"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_LAUNCH",
|
||||
"Node": "CPUSkipMask",
|
||||
"Duration": 1000,
|
||||
"Value": "0x0"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_LAUNCH",
|
||||
"Node": "CPU_BIG_TSKIN_BYPASS",
|
||||
|
@ -1831,6 +1848,12 @@
|
|||
"Duration": 0,
|
||||
"Value": "camera"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_STREAMING_EXTREME",
|
||||
"Node": "CPUSkipMask",
|
||||
"Duration": 0,
|
||||
"Value": "0x0"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_STREAMING_HIGH",
|
||||
"Node": "PowerHALCameraRunning",
|
||||
|
@ -2221,6 +2244,12 @@
|
|||
"Duration": 0,
|
||||
"Value": "4-7"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_STREAMING_LOW",
|
||||
"Node": "CPUSkipMask",
|
||||
"Duration": 0,
|
||||
"Value": "0x0"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
|
||||
"Node": "PowerHALCameraRunning",
|
||||
|
@ -2359,6 +2388,12 @@
|
|||
"Duration": 0,
|
||||
"Value": "30"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
|
||||
"Node": "CPUSkipMask",
|
||||
"Duration": 0,
|
||||
"Value": "0x0"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_VIDEO_RECORDING",
|
||||
"Type": "MaskHint",
|
||||
|
|
|
@ -221,7 +221,6 @@
|
|||
"0x0",
|
||||
"0x80"
|
||||
],
|
||||
"DefaultIndex": 0,
|
||||
"ResetOnInit": true
|
||||
},
|
||||
{
|
||||
|
@ -845,6 +844,12 @@
|
|||
"Duration": 1000,
|
||||
"Value": "0-3"
|
||||
},
|
||||
{
|
||||
"PowerHint": "LAUNCH",
|
||||
"Node": "CPUSkipMask",
|
||||
"Duration": 5000,
|
||||
"Value": "0x0"
|
||||
},
|
||||
{
|
||||
"PowerHint": "LAUNCH",
|
||||
"Node": "ReducePreferIdle",
|
||||
|
@ -992,6 +997,12 @@
|
|||
"Duration": 5000,
|
||||
"Value": "1"
|
||||
},
|
||||
{
|
||||
"PowerHint": "LAUNCH_EXTEND",
|
||||
"Node": "CPUSkipMask",
|
||||
"Duration": 2000,
|
||||
"Value": "0x0"
|
||||
},
|
||||
{
|
||||
"PowerHint": "LAUNCH_EXTEND",
|
||||
"Node": "CPUBigClusterMaxFreq",
|
||||
|
@ -1266,6 +1277,12 @@
|
|||
"Duration": 0,
|
||||
"Value": "0"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_LAUNCH",
|
||||
"Node": "CPUSkipMask",
|
||||
"Duration": 1000,
|
||||
"Value": "0x0"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_LAUNCH",
|
||||
"Node": "CPU_BIG_TSKIN_BYPASS",
|
||||
|
@ -1842,6 +1859,12 @@
|
|||
"Duration": 0,
|
||||
"Value": "camera"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_STREAMING_EXTREME",
|
||||
"Node": "CPUSkipMask",
|
||||
"Duration": 0,
|
||||
"Value": "0x0"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_STREAMING_HIGH",
|
||||
"Node": "PowerHALCameraRunning",
|
||||
|
@ -2232,6 +2255,12 @@
|
|||
"Duration": 0,
|
||||
"Value": "4-7"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_STREAMING_LOW",
|
||||
"Node": "CPUSkipMask",
|
||||
"Duration": 0,
|
||||
"Value": "0x0"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
|
||||
"Node": "PowerHALCameraRunning",
|
||||
|
@ -2370,6 +2399,12 @@
|
|||
"Duration": 0,
|
||||
"Value": "30"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
|
||||
"Node": "CPUSkipMask",
|
||||
"Duration": 0,
|
||||
"Value": "0x0"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_VIDEO_RECORDING",
|
||||
"Type": "MaskHint",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue