Merge "Enable PMU during photo capture" into 24D1-dev am: 0508270ad8

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

Change-Id: Icb25839791a8bed17ee44af3de72f8bd2485e890
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Ali K. Zadeh 2024-05-10 00:17:48 +00:00 committed by Automerger Merge Worker
commit 38b4b1562b
4 changed files with 138 additions and 74 deletions

View file

@ -603,10 +603,11 @@
"Name": "PMU_LIT_LIMIT_FREQ",
"Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/limit_frequency",
"Values": [
"1425000",
"1328000",
"1098000"
],
"DefaultIndex": 0,
"DefaultIndex": 1,
"ResetOnInit": true
},
{
@ -615,6 +616,7 @@
"Values": [
"76",
"70",
"40",
"55",
"42",
"35",
@ -629,6 +631,7 @@
"Path": "/sys/devices/system/cpu/cpufreq/policy4/sched_pixel/limit_frequency",
"Values": [
"1795000",
"1549000",
"1328000"
],
"DefaultIndex": 0,
@ -641,6 +644,7 @@
"59",
"50",
"32",
"15",
"30",
"20",
"18"
@ -663,8 +667,8 @@
"Values": [
"62",
"50",
"22",
"20"
"20",
"22"
],
"DefaultIndex": 0
},
@ -1445,27 +1449,39 @@
},
{
"PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
"Node": "CPUBigClusterMaxFreq",
"Duration": 3000,
"Value": "1885000"
},
{
"PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
"Node": "CPUMidClusterMaxFreq",
"Duration": 3000,
"Value": "1549000"
},
{
"PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
"Node": "CPULittleClusterMaxFreq",
"Node": "PMU_LIT_LIMIT_FREQ",
"Duration": 3000,
"Value": "1425000"
},
{
"PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
"Node": "PMU_POLL",
"Node": "PMU_MID_LIMIT_FREQ",
"Duration": 3000,
"Value": "0"
"Value": "1549000"
},
{
"PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
"Node": "PMU_BIG_LIMIT_FREQ",
"Duration": 3000,
"Value": "1885000"
},
{
"PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
"Node": "PMU_LIT_SPC_THRESHOLD",
"Duration": 3000,
"Value": "40"
},
{
"PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
"Node": "PMU_MID_SPC_THRESHOLD",
"Duration": 3000,
"Value": "15"
},
{
"PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
"Node": "PMU_BIG_SPC_THRESHOLD",
"Duration": 3000,
"Value": "20"
},
{
"PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",

View file

@ -603,10 +603,11 @@
"Name": "PMU_LIT_LIMIT_FREQ",
"Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/limit_frequency",
"Values": [
"1425000",
"1328000",
"1098000"
],
"DefaultIndex": 0,
"DefaultIndex": 1,
"ResetOnInit": true
},
{
@ -615,6 +616,7 @@
"Values": [
"76",
"70",
"40",
"55",
"42",
"35",
@ -629,6 +631,7 @@
"Path": "/sys/devices/system/cpu/cpufreq/policy4/sched_pixel/limit_frequency",
"Values": [
"1795000",
"1549000",
"1328000"
],
"DefaultIndex": 0,
@ -641,6 +644,7 @@
"59",
"50",
"32",
"15",
"30",
"20",
"18"
@ -663,8 +667,8 @@
"Values": [
"62",
"50",
"22",
"20"
"20",
"22"
],
"DefaultIndex": 0
},
@ -1445,27 +1449,39 @@
},
{
"PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
"Node": "CPUBigClusterMaxFreq",
"Duration": 3000,
"Value": "1885000"
},
{
"PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
"Node": "CPUMidClusterMaxFreq",
"Duration": 3000,
"Value": "1549000"
},
{
"PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
"Node": "CPULittleClusterMaxFreq",
"Node": "PMU_LIT_LIMIT_FREQ",
"Duration": 3000,
"Value": "1425000"
},
{
"PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
"Node": "PMU_POLL",
"Node": "PMU_MID_LIMIT_FREQ",
"Duration": 3000,
"Value": "0"
"Value": "1549000"
},
{
"PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
"Node": "PMU_BIG_LIMIT_FREQ",
"Duration": 3000,
"Value": "1885000"
},
{
"PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
"Node": "PMU_LIT_SPC_THRESHOLD",
"Duration": 3000,
"Value": "40"
},
{
"PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
"Node": "PMU_MID_SPC_THRESHOLD",
"Duration": 3000,
"Value": "15"
},
{
"PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
"Node": "PMU_BIG_SPC_THRESHOLD",
"Duration": 3000,
"Value": "20"
},
{
"PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",

View file

@ -53,7 +53,7 @@
"1800000",
"1548000",
"820000",
"610000",
"610000",
"0"
],
"ResetOnInit": true
@ -687,10 +687,11 @@
"Name": "PMU_LIT_LIMIT_FREQ",
"Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/limit_frequency",
"Values": [
"1425000",
"1328000",
"1098000"
],
"DefaultIndex": 0,
"DefaultIndex": 1,
"ResetOnInit": true
},
{
@ -699,6 +700,7 @@
"Values": [
"76",
"70",
"40",
"55",
"42",
"35",
@ -713,6 +715,7 @@
"Path": "/sys/devices/system/cpu/cpufreq/policy4/sched_pixel/limit_frequency",
"Values": [
"1795000",
"1549000",
"1328000"
],
"DefaultIndex": 0,
@ -725,6 +728,7 @@
"59",
"50",
"32",
"15",
"30",
"20",
"18"
@ -747,8 +751,8 @@
"Values": [
"62",
"50",
"22",
"20"
"20",
"22"
],
"DefaultIndex": 0
},
@ -1434,27 +1438,39 @@
},
{
"PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
"Node": "CPUBigClusterMaxFreq",
"Duration": 3000,
"Value": "1885000"
},
{
"PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
"Node": "CPUMidClusterMaxFreq",
"Duration": 3000,
"Value": "1549000"
},
{
"PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
"Node": "CPULittleClusterMaxFreq",
"Node": "PMU_LIT_LIMIT_FREQ",
"Duration": 3000,
"Value": "1425000"
},
{
"PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
"Node": "PMU_POLL",
"Node": "PMU_MID_LIMIT_FREQ",
"Duration": 3000,
"Value": "0"
"Value": "1549000"
},
{
"PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
"Node": "PMU_BIG_LIMIT_FREQ",
"Duration": 3000,
"Value": "1885000"
},
{
"PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
"Node": "PMU_LIT_SPC_THRESHOLD",
"Duration": 3000,
"Value": "40"
},
{
"PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
"Node": "PMU_MID_SPC_THRESHOLD",
"Duration": 3000,
"Value": "15"
},
{
"PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
"Node": "PMU_BIG_SPC_THRESHOLD",
"Duration": 3000,
"Value": "20"
},
{
"PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",

View file

@ -603,10 +603,11 @@
"Name": "PMU_LIT_LIMIT_FREQ",
"Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/limit_frequency",
"Values": [
"1425000",
"1328000",
"1098000"
],
"DefaultIndex": 0,
"DefaultIndex": 1,
"ResetOnInit": true
},
{
@ -615,6 +616,7 @@
"Values": [
"76",
"70",
"40",
"55",
"42",
"35",
@ -629,6 +631,7 @@
"Path": "/sys/devices/system/cpu/cpufreq/policy4/sched_pixel/limit_frequency",
"Values": [
"1795000",
"1549000",
"1328000"
],
"DefaultIndex": 0,
@ -641,6 +644,7 @@
"59",
"50",
"32",
"15",
"30",
"20",
"18"
@ -663,8 +667,8 @@
"Values": [
"62",
"50",
"22",
"20"
"20",
"22"
],
"DefaultIndex": 0
},
@ -773,7 +777,7 @@
"1800000",
"1548000",
"820000",
"610000",
"610000",
"0"
],
"ResetOnInit": true
@ -1445,27 +1449,39 @@
},
{
"PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
"Node": "CPUBigClusterMaxFreq",
"Duration": 3000,
"Value": "1885000"
},
{
"PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
"Node": "CPUMidClusterMaxFreq",
"Duration": 3000,
"Value": "1549000"
},
{
"PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
"Node": "CPULittleClusterMaxFreq",
"Node": "PMU_LIT_LIMIT_FREQ",
"Duration": 3000,
"Value": "1425000"
},
{
"PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
"Node": "PMU_POLL",
"Node": "PMU_MID_LIMIT_FREQ",
"Duration": 3000,
"Value": "0"
"Value": "1549000"
},
{
"PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
"Node": "PMU_BIG_LIMIT_FREQ",
"Duration": 3000,
"Value": "1885000"
},
{
"PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
"Node": "PMU_LIT_SPC_THRESHOLD",
"Duration": 3000,
"Value": "40"
},
{
"PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
"Node": "PMU_MID_SPC_THRESHOLD",
"Duration": 3000,
"Value": "15"
},
{
"PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
"Node": "PMU_BIG_SPC_THRESHOLD",
"Duration": 3000,
"Value": "20"
},
{
"PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",