Merge changes from topic "cherrypicker-L29300030002471799:N07500030040648998" into 24D1-dev

* changes:
  powerhint: port migration margin settings from p23
  powerhint: port dvfs_headroom settings from p23
This commit is contained in:
Treehugger Robot 2024-03-14 00:12:06 +00:00 committed by Android (Google) Code Review
commit 037acd229b
4 changed files with 122 additions and 118 deletions

View file

@ -217,9 +217,10 @@
"Name": "CPUUtilThreshold",
"Path": "/proc/vendor_sched/util_threshold",
"Values": [
"2048 1280 1280",
"1280",
"1100",
"1100 1024 1100"
"1100 1078 1024"
],
"DefaultIndex": 0,
"ResetOnInit": true
@ -230,9 +231,9 @@
"Values": [
"1280",
"1100",
"1280 1100 1055"
"1100 1078 1024"
],
"DefaultIndex": 0,
"DefaultIndex": 1,
"ResetOnInit": true
},
{
@ -1851,15 +1852,15 @@
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "CPUUtilThreshold",
"Node": "CPUDVFSHeadroom",
"Duration": 0,
"Value": "1100"
"Value": "1100 1078 1024"
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "CPUDVFSHeadroom",
"Node": "CPUUtilThreshold",
"Duration": 0,
"Value": "1100"
"Value": "1100 1078 1024"
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
@ -1933,6 +1934,12 @@
"Duration": 0,
"Value": "700000"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CPUDVFSHeadroom",
"Duration": 0,
"Value": "1280"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PowerHALCameraRunning",
@ -2005,18 +2012,6 @@
"Duration": 0,
"Value": "cam2"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CPUUtilThreshold",
"Duration": 0,
"Value": "1100 1024 1100"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CPUDVFSHeadroom",
"Duration": 0,
"Value": "1280 1100 1055"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CDPreferHighCap",
@ -2077,12 +2072,24 @@
"Duration": 0,
"Value": "camera"
},
{
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "CPUDVFSHeadroom",
"Duration": 0,
"Value": "1280"
},
{
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "PowerHALCameraRunning",
"Duration": 0,
"Value": "1"
},
{
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "CPUUtilThreshold",
"Duration": 0,
"Value": "1280"
},
{
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "CDPreferHighCap",
@ -2253,13 +2260,13 @@
},
{
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
"Node": "CPUUtilThreshold",
"Node": "CPUDVFSHeadroom",
"Duration": 0,
"Value": "1100"
},
{
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
"Node": "CPUDVFSHeadroom",
"Node": "CPUUtilThreshold",
"Duration": 0,
"Value": "1100"
},
@ -2600,12 +2607,6 @@
"Duration": 0,
"Value": "game"
},
{
"PowerHint": "GAME",
"Node": "CPUDVFSHeadroom",
"Duration": 0,
"Value": "1100"
},
{
"PowerHint": "GAME",
"Node": "CPUTaperedDVFSHeadroomEnable",
@ -2972,7 +2973,7 @@
"Name": "REFRESH_120FPS",
"PID_On": true,
"PID_Po": 2.0,
"PID_Pu": 1.0,
"PID_Pu": 0.6,
"PID_I": 0.0,
"PID_I_Init": 200,
"PID_I_High": 512,

View file

@ -213,13 +213,14 @@
],
"ResetOnInit": true
},
{
{
"Name": "CPUUtilThreshold",
"Path": "/proc/vendor_sched/util_threshold",
"Values": [
"2048 1280 1280",
"1280",
"1100",
"1100 1024 1100"
"1100 1078 1024"
],
"DefaultIndex": 0,
"ResetOnInit": true
@ -230,9 +231,9 @@
"Values": [
"1280",
"1100",
"1280 1100 1055"
"1100 1078 1024"
],
"DefaultIndex": 0,
"DefaultIndex": 1,
"ResetOnInit": true
},
{
@ -1213,7 +1214,7 @@
"Type": "EndHint",
"Value": "DISPLAY_UPDATE_IMMINENT"
},
{
{
"PowerHint": "DISPLAY_INACTIVE",
"Node": "TAPreferIdle",
"Duration": 0,
@ -1851,15 +1852,15 @@
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "CPUUtilThreshold",
"Node": "CPUDVFSHeadroom",
"Duration": 0,
"Value": "1100"
"Value": "1100 1078 1024"
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "CPUDVFSHeadroom",
"Node": "CPUUtilThreshold",
"Duration": 0,
"Value": "1100"
"Value": "1100 1078 1024"
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
@ -1933,6 +1934,12 @@
"Duration": 0,
"Value": "700000"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CPUDVFSHeadroom",
"Duration": 0,
"Value": "1280"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PowerHALCameraRunning",
@ -2005,18 +2012,6 @@
"Duration": 0,
"Value": "cam2"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CPUUtilThreshold",
"Duration": 0,
"Value": "1100 1024 1100"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CPUDVFSHeadroom",
"Duration": 0,
"Value": "1280 1100 1055"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CDPreferHighCap",
@ -2077,12 +2072,24 @@
"Duration": 0,
"Value": "camera"
},
{
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "CPUDVFSHeadroom",
"Duration": 0,
"Value": "1280"
},
{
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "PowerHALCameraRunning",
"Duration": 0,
"Value": "1"
},
{
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "CPUUtilThreshold",
"Duration": 0,
"Value": "1280"
},
{
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "CDPreferHighCap",
@ -2253,13 +2260,13 @@
},
{
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
"Node": "CPUUtilThreshold",
"Node": "CPUDVFSHeadroom",
"Duration": 0,
"Value": "1100"
},
{
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
"Node": "CPUDVFSHeadroom",
"Node": "CPUUtilThreshold",
"Duration": 0,
"Value": "1100"
},
@ -2600,12 +2607,6 @@
"Duration": 0,
"Value": "game"
},
{
"PowerHint": "GAME",
"Node": "CPUDVFSHeadroom",
"Duration": 0,
"Value": "1100"
},
{
"PowerHint": "GAME",
"Node": "CPUTaperedDVFSHeadroomEnable",
@ -2972,7 +2973,7 @@
"Name": "REFRESH_120FPS",
"PID_On": true,
"PID_Po": 2.0,
"PID_Pu": 1.0,
"PID_Pu": 0.6,
"PID_I": 0.0,
"PID_I_Init": 200,
"PID_I_High": 512,

View file

@ -213,13 +213,14 @@
],
"ResetOnInit": true
},
{
{
"Name": "CPUUtilThreshold",
"Path": "/proc/vendor_sched/util_threshold",
"Values": [
"2048 1280 1280",
"1280",
"1100",
"1100 1024 1100"
"1100 1078 1024"
],
"DefaultIndex": 0,
"ResetOnInit": true
@ -230,9 +231,9 @@
"Values": [
"1280",
"1100",
"1280 1100 1055"
"1100 1078 1024"
],
"DefaultIndex": 0,
"DefaultIndex": 1,
"ResetOnInit": true
},
{
@ -1213,7 +1214,7 @@
"Type": "EndHint",
"Value": "DISPLAY_UPDATE_IMMINENT"
},
{
{
"PowerHint": "DISPLAY_INACTIVE",
"Node": "TAPreferIdle",
"Duration": 0,
@ -1851,15 +1852,15 @@
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "CPUUtilThreshold",
"Node": "CPUDVFSHeadroom",
"Duration": 0,
"Value": "1100"
"Value": "1100 1078 1024"
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "CPUDVFSHeadroom",
"Node": "CPUUtilThreshold",
"Duration": 0,
"Value": "1100"
"Value": "1100 1078 1024"
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
@ -1933,6 +1934,12 @@
"Duration": 0,
"Value": "700000"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CPUDVFSHeadroom",
"Duration": 0,
"Value": "1280"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PowerHALCameraRunning",
@ -2005,18 +2012,6 @@
"Duration": 0,
"Value": "cam2"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CPUUtilThreshold",
"Duration": 0,
"Value": "1100 1024 1100"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CPUDVFSHeadroom",
"Duration": 0,
"Value": "1280 1100 1055"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CDPreferHighCap",
@ -2077,12 +2072,24 @@
"Duration": 0,
"Value": "camera"
},
{
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "CPUDVFSHeadroom",
"Duration": 0,
"Value": "1280"
},
{
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "PowerHALCameraRunning",
"Duration": 0,
"Value": "1"
},
{
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "CPUUtilThreshold",
"Duration": 0,
"Value": "1280"
},
{
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "CDPreferHighCap",
@ -2253,13 +2260,13 @@
},
{
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
"Node": "CPUUtilThreshold",
"Node": "CPUDVFSHeadroom",
"Duration": 0,
"Value": "1100"
},
{
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
"Node": "CPUDVFSHeadroom",
"Node": "CPUUtilThreshold",
"Duration": 0,
"Value": "1100"
},
@ -2600,12 +2607,6 @@
"Duration": 0,
"Value": "game"
},
{
"PowerHint": "GAME",
"Node": "CPUDVFSHeadroom",
"Duration": 0,
"Value": "1100"
},
{
"PowerHint": "GAME",
"Node": "CPUTaperedDVFSHeadroomEnable",
@ -2972,7 +2973,7 @@
"Name": "REFRESH_120FPS",
"PID_On": true,
"PID_Po": 2.0,
"PID_Pu": 1.0,
"PID_Pu": 0.6,
"PID_I": 0.0,
"PID_I_Init": 200,
"PID_I_High": 512,

View file

@ -213,13 +213,14 @@
],
"ResetOnInit": true
},
{
{
"Name": "CPUUtilThreshold",
"Path": "/proc/vendor_sched/util_threshold",
"Values": [
"2048 1280 1280",
"1280",
"1100",
"1100 1024 1100"
"1100 1078 1024"
],
"DefaultIndex": 0,
"ResetOnInit": true
@ -230,9 +231,9 @@
"Values": [
"1280",
"1100",
"1280 1100 1055"
"1100 1078 1024"
],
"DefaultIndex": 0,
"DefaultIndex": 1,
"ResetOnInit": true
},
{
@ -1213,7 +1214,7 @@
"Type": "EndHint",
"Value": "DISPLAY_UPDATE_IMMINENT"
},
{
{
"PowerHint": "DISPLAY_INACTIVE",
"Node": "TAPreferIdle",
"Duration": 0,
@ -1851,15 +1852,15 @@
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "CPUUtilThreshold",
"Node": "CPUDVFSHeadroom",
"Duration": 0,
"Value": "1100"
"Value": "1100 1078 1024"
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "CPUDVFSHeadroom",
"Node": "CPUUtilThreshold",
"Duration": 0,
"Value": "1100"
"Value": "1100 1078 1024"
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
@ -1933,6 +1934,12 @@
"Duration": 0,
"Value": "700000"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CPUDVFSHeadroom",
"Duration": 0,
"Value": "1280"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PowerHALCameraRunning",
@ -2005,18 +2012,6 @@
"Duration": 0,
"Value": "cam2"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CPUUtilThreshold",
"Duration": 0,
"Value": "1100 1024 1100"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CPUDVFSHeadroom",
"Duration": 0,
"Value": "1280 1100 1055"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CDPreferHighCap",
@ -2077,12 +2072,24 @@
"Duration": 0,
"Value": "camera"
},
{
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "CPUDVFSHeadroom",
"Duration": 0,
"Value": "1280"
},
{
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "PowerHALCameraRunning",
"Duration": 0,
"Value": "1"
},
{
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "CPUUtilThreshold",
"Duration": 0,
"Value": "1280"
},
{
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "CDPreferHighCap",
@ -2253,13 +2260,13 @@
},
{
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
"Node": "CPUUtilThreshold",
"Node": "CPUDVFSHeadroom",
"Duration": 0,
"Value": "1100"
},
{
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
"Node": "CPUDVFSHeadroom",
"Node": "CPUUtilThreshold",
"Duration": 0,
"Value": "1100"
},
@ -2600,12 +2607,6 @@
"Duration": 0,
"Value": "game"
},
{
"PowerHint": "GAME",
"Node": "CPUDVFSHeadroom",
"Duration": 0,
"Value": "1100"
},
{
"PowerHint": "GAME",
"Node": "CPUTaperedDVFSHeadroomEnable",
@ -2972,7 +2973,7 @@
"Name": "REFRESH_120FPS",
"PID_On": true,
"PID_Po": 2.0,
"PID_Pu": 1.0,
"PID_Pu": 0.6,
"PID_I": 0.0,
"PID_I_Init": 200,
"PID_I_High": 512,