Merge changes I1adc41ac,I0242977f into main

* changes:
  powerhint: Update not available frequency to reflect its actual behavior
  Update mismatched frequency for husky and shiba
This commit is contained in:
Paulsu Su 2024-08-31 07:35:44 +00:00 committed by Android (Google) Code Review
commit d576c70006
2 changed files with 69 additions and 86 deletions

View file

@ -81,8 +81,8 @@
"Values": [
"9999999",
"1098000",
"1475000",
"975000",
"1425000",
"955000",
"1197000",
"1328000",
"1548000",
@ -96,7 +96,7 @@
"Path": "/sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq",
"Values": [
"9999999",
"1475000",
"1548000",
"1197000",
"0"
],
@ -118,16 +118,13 @@
"Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq",
"Values": [
"9999999",
"2253000",
"2245000",
"2130000",
"1082000",
"1221000",
"1418000",
"910000",
"1328000",
"1622000",
"1572000",
"1836000",
"1999000"
"1945000"
],
"DefaultIndex": 0,
"ResetOnInit": true
@ -137,10 +134,9 @@
"Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_min_freq",
"Values": [
"9999999",
"2253000",
"2245000",
"2130000",
"1836000",
"1221000",
"0"
],
"ResetOnInit": true
@ -162,17 +158,13 @@
"Path": "/sys/devices/system/cpu/cpu8/cpufreq/scaling_max_freq",
"Values": [
"9999999",
"2704000",
"2507000",
"2252000",
"893000",
"1328000",
"1852000",
"1164000",
"2687000",
"2147000",
"1298000",
"1557000",
"1745000",
"2049000",
"2409000"
"2363000"
],
"DefaultIndex": 0,
"ResetOnInit": true
@ -182,11 +174,10 @@
"Path": "/sys/devices/system/cpu/cpu8/cpufreq/scaling_min_freq",
"Values": [
"9999999",
"2704000",
"2507000",
"2252000",
"1852000",
"1164000",
"2687000",
"2363000",
"2147000",
"1885000",
"0"
],
"ResetOnInit": true
@ -746,7 +737,7 @@
"Path": "/sys/devices/system/cpu/cpufreq/policy8/sched_pixel/limit_frequency",
"Values": [
"2363000",
"1852000",
"1745000",
"1298000"
],
"DefaultIndex": 0
@ -1350,7 +1341,7 @@
"PowerHint": "CAMERA_LAUNCH",
"Node": "CPUBigClusterMinFreq",
"Duration": 1000,
"Value": "1852000"
"Value": "1885000"
},
{
"PowerHint": "CAMERA_LAUNCH",
@ -1374,7 +1365,7 @@
"PowerHint": "CAMERA_LAUNCH",
"Node": "CPULittleClusterMinFreq",
"Duration": 1000,
"Value": "1475000"
"Value": "1548000"
},
{
"PowerHint": "CAMERA_LAUNCH",
@ -1464,19 +1455,19 @@
"PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
"Node": "CPUBigClusterMaxFreq",
"Duration": 3000,
"Value": "1852000"
"Value": "1745000"
},
{
"PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
"Node": "CPUMidClusterMaxFreq",
"Duration": 3000,
"Value": "1622000"
"Value": "1572000"
},
{
"PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
"Node": "CPULittleClusterMaxFreq",
"Duration": 3000,
"Value": "1475000"
"Value": "1425000"
},
{
"PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
@ -1548,13 +1539,13 @@
"PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK1",
"Node": "CPUBigClusterMaxFreq",
"Duration": 3000,
"Value": "2704000"
"Value": "2687000"
},
{
"PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK1",
"Node": "CPUBigClusterMinFreq",
"Duration": 3000,
"Value": "2704000"
"Value": "2687000"
},
{
"PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK2",
@ -1566,13 +1557,13 @@
"PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK2",
"Node": "CPUBigClusterMaxFreq",
"Duration": 3000,
"Value": "2507000"
"Value": "2363000"
},
{
"PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK2",
"Node": "CPUBigClusterMinFreq",
"Duration": 3000,
"Value": "2507000"
"Value": "2363000"
},
{
"PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK3",
@ -1584,13 +1575,13 @@
"PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK3",
"Node": "CPUBigClusterMaxFreq",
"Duration": 3000,
"Value": "2252000"
"Value": "2147000"
},
{
"PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK3",
"Node": "CPUBigClusterMinFreq",
"Duration": 3000,
"Value": "2252000"
"Value": "2147000"
},
{
"PowerHint": "GCA_CAMERA_SHOT_MIDCPU_RANK1",
@ -1608,13 +1599,13 @@
"PowerHint": "GCA_CAMERA_SHOT_MIDCPU_RANK2",
"Node": "CPUMidClusterMaxFreq",
"Duration": 3000,
"Value": "2253000"
"Value": "2245000"
},
{
"PowerHint": "GCA_CAMERA_SHOT_MIDCPU_RANK2",
"Node": "CPUMidClusterMinFreq",
"Duration": 3000,
"Value": "2253000"
"Value": "2245000"
},
{
"PowerHint": "GCA_CAMERA_SHOT_MIDCPU_RANK3",
@ -2262,19 +2253,19 @@
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "CPUBigClusterMaxFreq",
"Duration": 0,
"Value": "1852000"
"Value": "1745000"
},
{
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "CPUMidClusterMaxFreq",
"Duration": 0,
"Value": "1622000"
"Value": "1572000"
},
{
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "CPULittleClusterMaxFreq",
"Duration": 0,
"Value": "1475000"
"Value": "1425000"
},
{
"PowerHint": "CAMERA_STREAMING_LOW",
@ -2534,7 +2525,7 @@
"PowerHint": "LOW_POWER_LITTLE_CLUSTER_50",
"Node": "CPULittleClusterMaxFreq",
"Duration": 3600000,
"Value": "975000"
"Value": "955000"
},
{
"PowerHint": "LOW_POWER_LITTLE_CLUSTER_60",
@ -2576,7 +2567,7 @@
"PowerHint": "LOW_POWER_MID_CLUSTER_70",
"Node": "CPUMidClusterMaxFreq",
"Duration": 3600000,
"Value": "1622000"
"Value": "1572000"
},
{
"PowerHint": "LOW_POWER_MID_CLUSTER_80",
@ -2588,13 +2579,13 @@
"PowerHint": "LOW_POWER_MID_CLUSTER_90",
"Node": "CPUMidClusterMaxFreq",
"Duration": 3600000,
"Value": "1999000"
"Value": "1945000"
},
{
"PowerHint": "LOW_POWER_CPU_50",
"Node": "CPUBigClusterMaxFreq",
"Duration": 3600000,
"Value": "1328000"
"Value": "1298000"
},
{
"PowerHint": "LOW_POWER_CPU_60",
@ -2618,7 +2609,7 @@
"PowerHint": "LOW_POWER_CPU_90",
"Node": "CPUBigClusterMaxFreq",
"Duration": 3600000,
"Value": "2409000"
"Value": "2363000"
},
{
"PowerHint": "LOW_POWER",
@ -2899,7 +2890,7 @@
"PowerHint": "FACE_UNLOCK_BOOST",
"Node": "CPUBigClusterMinFreq",
"Duration": 500,
"Value": "1852000"
"Value": "1885000"
},
{
"PowerHint": "FACE_UNLOCK_BOOST",
@ -3001,7 +2992,7 @@
"PowerHint": "CAMERA_PROJECT11",
"Node": "PMU_BIG_LIMIT_FREQ",
"Duration": 0,
"Value": "1852000"
"Value": "1745000"
},
{
"PowerHint": "CAMERA_PROJECT11",
@ -3049,19 +3040,19 @@
"PowerHint": "CAMERA_PROJECT11",
"Node": "CPUBigClusterMaxFreq",
"Duration": 0,
"Value": "1852000"
"Value": "1745000"
},
{
"PowerHint": "CAMERA_PROJECT11",
"Node": "CPUMidClusterMaxFreq",
"Duration": 0,
"Value": "1622000"
"Value": "1572000"
},
{
"PowerHint": "CAMERA_PROJECT11",
"Node": "CPULittleClusterMaxFreq",
"Duration": 0,
"Value": "1475000"
"Value": "1425000"
},
{
"PowerHint": "CAMERA_PROJECT11",

View file

@ -81,8 +81,8 @@
"Values": [
"9999999",
"1098000",
"1475000",
"975000",
"1425000",
"955000",
"1197000",
"1328000",
"1548000",
@ -96,7 +96,7 @@
"Path": "/sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq",
"Values": [
"9999999",
"1475000",
"1548000",
"1197000",
"0"
],
@ -118,14 +118,11 @@
"Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq",
"Values": [
"9999999",
"1082000",
"1221000",
"1418000",
"910000",
"1328000",
"1622000",
"1572000",
"1836000",
"1999000"
"1945000"
],
"DefaultIndex": 0,
"ResetOnInit": true
@ -136,7 +133,6 @@
"Values": [
"9999999",
"1836000",
"1221000",
"0"
],
"ResetOnInit": true
@ -158,14 +154,11 @@
"Path": "/sys/devices/system/cpu/cpu8/cpufreq/scaling_max_freq",
"Values": [
"9999999",
"893000",
"1328000",
"1852000",
"1164000",
"1298000",
"1557000",
"1745000",
"2049000",
"2409000"
"2363000"
],
"DefaultIndex": 0,
"ResetOnInit": true
@ -175,8 +168,7 @@
"Path": "/sys/devices/system/cpu/cpu8/cpufreq/scaling_min_freq",
"Values": [
"9999999",
"1852000",
"1164000",
"1885000",
"0"
],
"ResetOnInit": true
@ -746,7 +738,7 @@
"Path": "/sys/devices/system/cpu/cpufreq/policy8/sched_pixel/limit_frequency",
"Values": [
"2363000",
"1852000",
"1745000",
"1298000"
],
"DefaultIndex": 0
@ -1356,7 +1348,7 @@
"PowerHint": "CAMERA_LAUNCH",
"Node": "CPUBigClusterMinFreq",
"Duration": 1000,
"Value": "1852000"
"Value": "1885000"
},
{
"PowerHint": "CAMERA_LAUNCH",
@ -1380,7 +1372,7 @@
"PowerHint": "CAMERA_LAUNCH",
"Node": "CPULittleClusterMinFreq",
"Duration": 1000,
"Value": "1475000"
"Value": "1548000"
},
{
"PowerHint": "CAMERA_LAUNCH",
@ -1470,19 +1462,19 @@
"PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
"Node": "CPUBigClusterMaxFreq",
"Duration": 3000,
"Value": "1852000"
"Value": "1745000"
},
{
"PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
"Node": "CPUMidClusterMaxFreq",
"Duration": 3000,
"Value": "1622000"
"Value": "1572000"
},
{
"PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
"Node": "CPULittleClusterMaxFreq",
"Duration": 3000,
"Value": "1475000"
"Value": "1425000"
},
{
"PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
@ -2160,19 +2152,19 @@
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "CPUBigClusterMaxFreq",
"Duration": 0,
"Value": "1852000"
"Value": "1745000"
},
{
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "CPUMidClusterMaxFreq",
"Duration": 0,
"Value": "1622000"
"Value": "1572000"
},
{
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "CPULittleClusterMaxFreq",
"Duration": 0,
"Value": "1475000"
"Value": "1425000"
},
{
"PowerHint": "CAMERA_STREAMING_LOW",
@ -2438,7 +2430,7 @@
"PowerHint": "LOW_POWER_LITTLE_CLUSTER_50",
"Node": "CPULittleClusterMaxFreq",
"Duration": 3600000,
"Value": "975000"
"Value": "955000"
},
{
"PowerHint": "LOW_POWER_LITTLE_CLUSTER_60",
@ -2480,7 +2472,7 @@
"PowerHint": "LOW_POWER_MID_CLUSTER_70",
"Node": "CPUMidClusterMaxFreq",
"Duration": 3600000,
"Value": "1622000"
"Value": "1572000"
},
{
"PowerHint": "LOW_POWER_MID_CLUSTER_80",
@ -2492,13 +2484,13 @@
"PowerHint": "LOW_POWER_MID_CLUSTER_90",
"Node": "CPUMidClusterMaxFreq",
"Duration": 3600000,
"Value": "1999000"
"Value": "1945000"
},
{
"PowerHint": "LOW_POWER_CPU_50",
"Node": "CPUBigClusterMaxFreq",
"Duration": 3600000,
"Value": "1328000"
"Value": "1298000"
},
{
"PowerHint": "LOW_POWER_CPU_60",
@ -2522,7 +2514,7 @@
"PowerHint": "LOW_POWER_CPU_90",
"Node": "CPUBigClusterMaxFreq",
"Duration": 3600000,
"Value": "2409000"
"Value": "2363000"
},
{
"PowerHint": "LOW_POWER",
@ -2803,7 +2795,7 @@
"PowerHint": "FACE_UNLOCK_BOOST",
"Node": "CPUBigClusterMinFreq",
"Duration": 500,
"Value": "1852000"
"Value": "1885000"
},
{
"PowerHint": "FACE_UNLOCK_BOOST",
@ -2905,7 +2897,7 @@
"PowerHint": "CAMERA_PROJECT11",
"Node": "PMU_BIG_LIMIT_FREQ",
"Duration": 0,
"Value": "1852000"
"Value": "1745000"
},
{
"PowerHint": "CAMERA_PROJECT11",
@ -2953,19 +2945,19 @@
"PowerHint": "CAMERA_PROJECT11",
"Node": "CPUBigClusterMaxFreq",
"Duration": 0,
"Value": "1852000"
"Value": "1745000"
},
{
"PowerHint": "CAMERA_PROJECT11",
"Node": "CPUMidClusterMaxFreq",
"Duration": 0,
"Value": "1622000"
"Value": "1572000"
},
{
"PowerHint": "CAMERA_PROJECT11",
"Node": "CPULittleClusterMaxFreq",
"Duration": 0,
"Value": "1475000"
"Value": "1425000"
},
{
"PowerHint": "CAMERA_PROJECT11",