Merge "Revert "Set big core to cpu skip mask by default"" into 24D1-dev am: c381116bd3

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

Change-Id: I1ec937a6d44a9bea5df6c7735dc78eaf322515e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Wei Wang 2024-05-02 21:41:58 +00:00 committed by Automerger Merge Worker
commit 075542984b
4 changed files with 4 additions and 144 deletions

View file

@ -221,6 +221,7 @@
"0x0", "0x0",
"0x80" "0x80"
], ],
"DefaultIndex": 0,
"ResetOnInit": true "ResetOnInit": true
}, },
{ {
@ -844,12 +845,6 @@
"Duration": 1000, "Duration": 1000,
"Value": "0-3" "Value": "0-3"
}, },
{
"PowerHint": "LAUNCH",
"Node": "CPUSkipMask",
"Duration": 5000,
"Value": "0x0"
},
{ {
"PowerHint": "LAUNCH", "PowerHint": "LAUNCH",
"Node": "ReducePreferIdle", "Node": "ReducePreferIdle",
@ -997,12 +992,6 @@
"Duration": 5000, "Duration": 5000,
"Value": "1" "Value": "1"
}, },
{
"PowerHint": "LAUNCH_EXTEND",
"Node": "CPUSkipMask",
"Duration": 2000,
"Value": "0x0"
},
{ {
"PowerHint": "LAUNCH_EXTEND", "PowerHint": "LAUNCH_EXTEND",
"Node": "CPUBigClusterMaxFreq", "Node": "CPUBigClusterMaxFreq",
@ -1277,12 +1266,6 @@
"Duration": 0, "Duration": 0,
"Value": "0" "Value": "0"
}, },
{
"PowerHint": "CAMERA_LAUNCH",
"Node": "CPUSkipMask",
"Duration": 1000,
"Value": "0x0"
},
{ {
"PowerHint": "CAMERA_LAUNCH", "PowerHint": "CAMERA_LAUNCH",
"Node": "CPU_BIG_TSKIN_BYPASS", "Node": "CPU_BIG_TSKIN_BYPASS",
@ -1859,12 +1842,6 @@
"Duration": 0, "Duration": 0,
"Value": "camera" "Value": "camera"
}, },
{
"PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "CPUSkipMask",
"Duration": 0,
"Value": "0x0"
},
{ {
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "PowerHALCameraRunning", "Node": "PowerHALCameraRunning",
@ -2255,12 +2232,6 @@
"Duration": 0, "Duration": 0,
"Value": "4-7" "Value": "4-7"
}, },
{
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "CPUSkipMask",
"Duration": 0,
"Value": "0x0"
},
{ {
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
"Node": "PowerHALCameraRunning", "Node": "PowerHALCameraRunning",
@ -2399,12 +2370,6 @@
"Duration": 0, "Duration": 0,
"Value": "30" "Value": "30"
}, },
{
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
"Node": "CPUSkipMask",
"Duration": 0,
"Value": "0x0"
},
{ {
"PowerHint": "CAMERA_VIDEO_RECORDING", "PowerHint": "CAMERA_VIDEO_RECORDING",
"Type": "MaskHint", "Type": "MaskHint",

View file

@ -221,6 +221,7 @@
"0x0", "0x0",
"0x80" "0x80"
], ],
"DefaultIndex": 0,
"ResetOnInit": true "ResetOnInit": true
}, },
{ {
@ -844,12 +845,6 @@
"Duration": 1000, "Duration": 1000,
"Value": "0-3" "Value": "0-3"
}, },
{
"PowerHint": "LAUNCH",
"Node": "CPUSkipMask",
"Duration": 5000,
"Value": "0x0"
},
{ {
"PowerHint": "LAUNCH", "PowerHint": "LAUNCH",
"Node": "ReducePreferIdle", "Node": "ReducePreferIdle",
@ -997,12 +992,6 @@
"Duration": 5000, "Duration": 5000,
"Value": "1" "Value": "1"
}, },
{
"PowerHint": "LAUNCH_EXTEND",
"Node": "CPUSkipMask",
"Duration": 2000,
"Value": "0x0"
},
{ {
"PowerHint": "LAUNCH_EXTEND", "PowerHint": "LAUNCH_EXTEND",
"Node": "CPUBigClusterMaxFreq", "Node": "CPUBigClusterMaxFreq",
@ -1277,12 +1266,6 @@
"Duration": 0, "Duration": 0,
"Value": "0" "Value": "0"
}, },
{
"PowerHint": "CAMERA_LAUNCH",
"Node": "CPUSkipMask",
"Duration": 1000,
"Value": "0x0"
},
{ {
"PowerHint": "CAMERA_LAUNCH", "PowerHint": "CAMERA_LAUNCH",
"Node": "CPU_BIG_TSKIN_BYPASS", "Node": "CPU_BIG_TSKIN_BYPASS",
@ -1859,12 +1842,6 @@
"Duration": 0, "Duration": 0,
"Value": "camera" "Value": "camera"
}, },
{
"PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "CPUSkipMask",
"Duration": 0,
"Value": "0x0"
},
{ {
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "PowerHALCameraRunning", "Node": "PowerHALCameraRunning",
@ -2255,12 +2232,6 @@
"Duration": 0, "Duration": 0,
"Value": "4-7" "Value": "4-7"
}, },
{
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "CPUSkipMask",
"Duration": 0,
"Value": "0x0"
},
{ {
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
"Node": "PowerHALCameraRunning", "Node": "PowerHALCameraRunning",
@ -2399,12 +2370,6 @@
"Duration": 0, "Duration": 0,
"Value": "30" "Value": "30"
}, },
{
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
"Node": "CPUSkipMask",
"Duration": 0,
"Value": "0x0"
},
{ {
"PowerHint": "CAMERA_VIDEO_RECORDING", "PowerHint": "CAMERA_VIDEO_RECORDING",
"Type": "MaskHint", "Type": "MaskHint",

View file

@ -275,6 +275,7 @@
"0x0", "0x0",
"0x80" "0x80"
], ],
"DefaultIndex": 0,
"ResetOnInit": true "ResetOnInit": true
}, },
{ {
@ -833,12 +834,6 @@
"Duration": 1000, "Duration": 1000,
"Value": "0-3" "Value": "0-3"
}, },
{
"PowerHint": "LAUNCH",
"Node": "CPUSkipMask",
"Duration": 5000,
"Value": "0x0"
},
{ {
"PowerHint": "LAUNCH", "PowerHint": "LAUNCH",
"Node": "ReducePreferIdle", "Node": "ReducePreferIdle",
@ -986,12 +981,6 @@
"Duration": 5000, "Duration": 5000,
"Value": "1" "Value": "1"
}, },
{
"PowerHint": "LAUNCH_EXTEND",
"Node": "CPUSkipMask",
"Duration": 2000,
"Value": "0x0"
},
{ {
"PowerHint": "LAUNCH_EXTEND", "PowerHint": "LAUNCH_EXTEND",
"Node": "CPUBigClusterMaxFreq", "Node": "CPUBigClusterMaxFreq",
@ -1266,12 +1255,6 @@
"Duration": 0, "Duration": 0,
"Value": "0" "Value": "0"
}, },
{
"PowerHint": "CAMERA_LAUNCH",
"Node": "CPUSkipMask",
"Duration": 1000,
"Value": "0x0"
},
{ {
"PowerHint": "CAMERA_LAUNCH", "PowerHint": "CAMERA_LAUNCH",
"Node": "CPU_BIG_TSKIN_BYPASS", "Node": "CPU_BIG_TSKIN_BYPASS",
@ -1848,12 +1831,6 @@
"Duration": 0, "Duration": 0,
"Value": "camera" "Value": "camera"
}, },
{
"PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "CPUSkipMask",
"Duration": 0,
"Value": "0x0"
},
{ {
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "PowerHALCameraRunning", "Node": "PowerHALCameraRunning",
@ -2244,12 +2221,6 @@
"Duration": 0, "Duration": 0,
"Value": "4-7" "Value": "4-7"
}, },
{
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "CPUSkipMask",
"Duration": 0,
"Value": "0x0"
},
{ {
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
"Node": "PowerHALCameraRunning", "Node": "PowerHALCameraRunning",
@ -2388,12 +2359,6 @@
"Duration": 0, "Duration": 0,
"Value": "30" "Value": "30"
}, },
{
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
"Node": "CPUSkipMask",
"Duration": 0,
"Value": "0x0"
},
{ {
"PowerHint": "CAMERA_VIDEO_RECORDING", "PowerHint": "CAMERA_VIDEO_RECORDING",
"Type": "MaskHint", "Type": "MaskHint",

View file

@ -221,6 +221,7 @@
"0x0", "0x0",
"0x80" "0x80"
], ],
"DefaultIndex": 0,
"ResetOnInit": true "ResetOnInit": true
}, },
{ {
@ -844,12 +845,6 @@
"Duration": 1000, "Duration": 1000,
"Value": "0-3" "Value": "0-3"
}, },
{
"PowerHint": "LAUNCH",
"Node": "CPUSkipMask",
"Duration": 5000,
"Value": "0x0"
},
{ {
"PowerHint": "LAUNCH", "PowerHint": "LAUNCH",
"Node": "ReducePreferIdle", "Node": "ReducePreferIdle",
@ -997,12 +992,6 @@
"Duration": 5000, "Duration": 5000,
"Value": "1" "Value": "1"
}, },
{
"PowerHint": "LAUNCH_EXTEND",
"Node": "CPUSkipMask",
"Duration": 2000,
"Value": "0x0"
},
{ {
"PowerHint": "LAUNCH_EXTEND", "PowerHint": "LAUNCH_EXTEND",
"Node": "CPUBigClusterMaxFreq", "Node": "CPUBigClusterMaxFreq",
@ -1277,12 +1266,6 @@
"Duration": 0, "Duration": 0,
"Value": "0" "Value": "0"
}, },
{
"PowerHint": "CAMERA_LAUNCH",
"Node": "CPUSkipMask",
"Duration": 1000,
"Value": "0x0"
},
{ {
"PowerHint": "CAMERA_LAUNCH", "PowerHint": "CAMERA_LAUNCH",
"Node": "CPU_BIG_TSKIN_BYPASS", "Node": "CPU_BIG_TSKIN_BYPASS",
@ -1859,12 +1842,6 @@
"Duration": 0, "Duration": 0,
"Value": "camera" "Value": "camera"
}, },
{
"PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "CPUSkipMask",
"Duration": 0,
"Value": "0x0"
},
{ {
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "PowerHALCameraRunning", "Node": "PowerHALCameraRunning",
@ -2255,12 +2232,6 @@
"Duration": 0, "Duration": 0,
"Value": "4-7" "Value": "4-7"
}, },
{
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "CPUSkipMask",
"Duration": 0,
"Value": "0x0"
},
{ {
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
"Node": "PowerHALCameraRunning", "Node": "PowerHALCameraRunning",
@ -2399,12 +2370,6 @@
"Duration": 0, "Duration": 0,
"Value": "30" "Value": "30"
}, },
{
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
"Node": "CPUSkipMask",
"Duration": 0,
"Value": "0x0"
},
{ {
"PowerHint": "CAMERA_VIDEO_RECORDING", "PowerHint": "CAMERA_VIDEO_RECORDING",
"Type": "MaskHint", "Type": "MaskHint",