Merge changes Iaeb21216,I984252d8,Ica39fe7d into main

* changes:
  Change set preferred idle mask to top-app
  Backport autopreferfit for launch
  Revert "backport launch powerhint to felix"
This commit is contained in:
Chung-Kai (Michael) Mei 2024-12-24 21:14:01 -08:00 committed by Android (Google) Code Review
commit ccdbdfbbd2

View file

@ -62,18 +62,6 @@
], ],
"ResetOnInit": true "ResetOnInit": true
}, },
{
"Name": "CPULittleClusterDownRateLimitUs",
"Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/down_rate_limit_us",
"Values": [
"5000",
"2000",
"1000",
"500"
],
"DefaultIndex": 0,
"ResetOnInit": true
},
{ {
"Name": "CPUMidClusterMaxFreq", "Name": "CPUMidClusterMaxFreq",
"Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq", "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq",
@ -106,19 +94,6 @@
], ],
"ResetOnInit": true "ResetOnInit": true
}, },
{
"Name": "CPUMidClusterDownRateLimitUs",
"Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us",
"Values": [
"20000",
"5000",
"3000",
"2000",
"500"
],
"DefaultIndex": 0,
"ResetOnInit": true
},
{ {
"Name": "CPUBigClusterMaxFreq", "Name": "CPUBigClusterMaxFreq",
"Path": "/sys/devices/system/cpu/cpu6/cpufreq/scaling_max_freq", "Path": "/sys/devices/system/cpu/cpu6/cpufreq/scaling_max_freq",
@ -153,18 +128,6 @@
], ],
"ResetOnInit": true "ResetOnInit": true
}, },
{
"Name": "CPUBigClusterDownRateLimitUs",
"Path": "/sys/devices/system/cpu/cpu6/cpufreq/sched_pixel/down_rate_limit_us",
"Values": [
"20000",
"3000",
"2000",
"500"
],
"DefaultIndex": 0,
"ResetOnInit": true
},
{ {
"Name": "GPUDvfsPeriod", "Name": "GPUDvfsPeriod",
"Path": "/sys/devices/platform/28000000.mali/dvfs_period", "Path": "/sys/devices/platform/28000000.mali/dvfs_period",
@ -183,15 +146,6 @@
], ],
"ResetOnInit": true "ResetOnInit": true
}, },
{
"Name": "AutoPreferIdle",
"Path": "/proc/vendor_sched/auto_prefer_idle",
"Values": [
"0",
"1"
],
"ResetOnInit": true
},
{ {
"Name": "CPUUtilThreshold", "Name": "CPUUtilThreshold",
"Path": "/proc/vendor_sched/util_threshold", "Path": "/proc/vendor_sched/util_threshold",
@ -212,16 +166,6 @@
"DefaultIndex": 0, "DefaultIndex": 0,
"ResetOnInit": true "ResetOnInit": true
}, },
{
"Name": "CPUTaperedDVFSHeadroomEnable",
"Path": "/proc/vendor_sched/tapered_dvfs_headroom_enable",
"Values": [
"0",
"1"
],
"DefaultIndex": 0,
"ResetOnInit": true
},
{ {
"Name": "MIFTargetLoad", "Name": "MIFTargetLoad",
"Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load",
@ -400,12 +344,22 @@
"ResetOnInit": true "ResetOnInit": true
}, },
{ {
"Name": "TAPreferredIdleMaskHigh", "Name": "TAPreferredIdleMaskMid",
"Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_high", "Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_mid",
"Values": [ "Values": [
"0xff", "0x3f",
"0xf0", "0xf0",
"0x7f" "0xff"
],
"ResetOnInit": true
},
{
"Name": "TAPreferredIdleMaskLow",
"Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_low",
"Values": [
"0x3f",
"0xf0",
"0xff"
], ],
"ResetOnInit": true "ResetOnInit": true
}, },
@ -803,26 +757,6 @@
], ],
"DefaultIndex": 0, "DefaultIndex": 0,
"ResetOnInit": true "ResetOnInit": true
},
{
"Name": "CPUUClampMaxFilterEnable",
"Path": "/proc/vendor_sched/uclamp_max_filter_enable",
"Values": [
"1",
"0"
],
"DefaultIndex": 0,
"ResetOnInit": true
},
{
"Name": "BGUClampMaxBoost",
"Path": "/proc/vendor_sched/groups/bg/uclamp_max",
"Values": [
"130",
"512"
],
"DefaultIndex": 0,
"ResetOnInit": true
} }
], ],
"Actions": [ "Actions": [
@ -856,18 +790,18 @@
"Duration": 5000, "Duration": 5000,
"Value": "0" "Value": "0"
}, },
{
"PowerHint": "LAUNCH",
"Node": "AutoPreferIdle",
"Duration": 5000,
"Value": "0"
},
{ {
"PowerHint": "LAUNCH_GPU", "PowerHint": "LAUNCH_GPU",
"Node": "GPUDvfsPeriod", "Node": "GPUDvfsPeriod",
"Duration": 1000, "Duration": 1000,
"Value": "10" "Value": "10"
}, },
{
"PowerHint": "LAUNCH",
"Node": "FGPreferIdle",
"Duration": 5000,
"Value": "1"
},
{ {
"PowerHint": "LAUNCH", "PowerHint": "LAUNCH",
"Type": "DoHint", "Type": "DoHint",
@ -893,15 +827,9 @@
}, },
{ {
"PowerHint": "LAUNCH", "PowerHint": "LAUNCH",
"Node": "CPUUClampMaxFilterEnable", "Node": "TAUClampBoost",
"Duration": 5000, "Duration": 5000,
"Value": "0" "Value": "764"
},
{
"PowerHint": "LAUNCH",
"Node": "BGUClampMaxBoost",
"Duration": 5000,
"Value": "512"
}, },
{ {
"PowerHint": "LAUNCH", "PowerHint": "LAUNCH",
@ -917,56 +845,10 @@
}, },
{ {
"PowerHint": "LAUNCH", "PowerHint": "LAUNCH",
"Type": "DoHint", "Node": "NPITaskPacking",
"Value": "LAUNCH_PMU"
},
{
"PowerHint": "LAUNCH_PMU",
"Node": "PMU_POLL",
"Duration": 3000,
"Value": "0"
},
{
"PowerHint": "LAUNCH",
"Type": "DoHint",
"Value": "LAUNCH_EXTEND"
},
{
"PowerHint": "LAUNCH",
"Node": "CPUDVFSHeadroom",
"Duration": 5000,
"Value": "1280"
},
{
"PowerHint": "LAUNCH",
"Node": "CPUTaperedDVFSHeadroomEnable",
"Duration": 5000, "Duration": 5000,
"Value": "0" "Value": "0"
}, },
{
"PowerHint": "LAUNCH",
"Node": "CPULittleClusterDownRateLimitUs",
"Duration": 5000,
"Value": "5000"
},
{
"PowerHint": "LAUNCH",
"Node": "CPUMidClusterDownRateLimitUs",
"Duration": 5000,
"Value": "20000"
},
{
"PowerHint": "LAUNCH",
"Node": "CPUBigClusterDownRateLimitUs",
"Duration": 5000,
"Value": "20000"
},
{
"PowerHint": "LAUNCH",
"Node": "TAPreferIdle",
"Duration": 5000,
"Value": "1"
},
{ {
"PowerHint": "LAUNCH", "PowerHint": "LAUNCH",
"Node": "TAAutoPreferFit", "Node": "TAAutoPreferFit",
@ -975,9 +857,15 @@
}, },
{ {
"PowerHint": "LAUNCH", "PowerHint": "LAUNCH",
"Node": "TAPreferredIdleMaskHigh", "Node": "TAPreferredIdleMaskMid",
"Duration": 5000, "Duration": 5000,
"Value": "0xff" "Value": "0x3f"
},
{
"PowerHint": "LAUNCH",
"Node": "TAPreferredIdleMaskLow",
"Duration": 5000,
"Value": "0x3f"
}, },
{ {
"PowerHint": "LAUNCH", "PowerHint": "LAUNCH",
@ -1011,9 +899,19 @@
}, },
{ {
"PowerHint": "LAUNCH", "PowerHint": "LAUNCH",
"Node": "FGPreferIdle", "Type": "DoHint",
"Duration": 5000, "Value": "LAUNCH_EXTEND"
"Value": "1" },
{
"PowerHint": "LAUNCH",
"Type": "DoHint",
"Value": "LAUNCH_PMU"
},
{
"PowerHint": "LAUNCH_PMU",
"Node": "PMU_POLL",
"Duration": 3000,
"Value": "0"
}, },
{ {
"PowerHint": "LAUNCH_EXTEND", "PowerHint": "LAUNCH_EXTEND",