Merge "thermal: optimize thermal policy for camera mode" into main

This commit is contained in:
Treehugger Robot 2023-11-20 17:15:34 +00:00 committed by Android (Google) Code Review
commit 6ddd620334
9 changed files with 360 additions and 95 deletions

View file

@ -1625,6 +1625,18 @@
"Duration": 0,
"Value": "camera"
},
{
"PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "VIRTUAL-SKIN-CPU-MID",
"Duration": 0,
"Value": "camera"
},
{
"PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "VIRTUAL-SKIN-CPU-HIGH",
"Duration": 0,
"Value": "camera"
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "PowerHALCameraRunning",
@ -1781,6 +1793,18 @@
"Duration": 0,
"Value": "camera"
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "VIRTUAL-SKIN-CPU-MID",
"Duration": 0,
"Value": "camera"
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "VIRTUAL-SKIN-CPU-HIGH",
"Duration": 0,
"Value": "camera"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PowerHALCameraRunning",
@ -1913,6 +1937,18 @@
"Duration": 0,
"Value": "camera"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "VIRTUAL-SKIN-CPU-MID",
"Duration": 0,
"Value": "camera"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "VIRTUAL-SKIN-CPU-HIGH",
"Duration": 0,
"Value": "camera"
},
{
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "PowerHALCameraRunning",

View file

@ -1625,6 +1625,18 @@
"Duration": 0,
"Value": "camera"
},
{
"PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "VIRTUAL-SKIN-CPU-MID",
"Duration": 0,
"Value": "camera"
},
{
"PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "VIRTUAL-SKIN-CPU-HIGH",
"Duration": 0,
"Value": "camera"
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "PowerHALCameraRunning",
@ -1781,6 +1793,18 @@
"Duration": 0,
"Value": "camera"
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "VIRTUAL-SKIN-CPU-MID",
"Duration": 0,
"Value": "camera"
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "VIRTUAL-SKIN-CPU-HIGH",
"Duration": 0,
"Value": "camera"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PowerHALCameraRunning",
@ -1913,6 +1937,18 @@
"Duration": 0,
"Value": "camera"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "VIRTUAL-SKIN-CPU-MID",
"Duration": 0,
"Value": "camera"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "VIRTUAL-SKIN-CPU-HIGH",
"Duration": 0,
"Value": "camera"
},
{
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "PowerHALCameraRunning",

View file

@ -1625,6 +1625,24 @@
"Duration": 0,
"Value": "camera"
},
{
"PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "VIRTUAL-SKIN-CPU-MID",
"Duration": 0,
"Value": "camera"
},
{
"PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "VIRTUAL-SKIN-CPU-HIGH",
"Duration": 0,
"Value": "camera"
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "PowerHALCameraRunning",
"Duration": 0,
"Value": "1"
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "PowerHALCameraRunning",
@ -1781,6 +1799,18 @@
"Duration": 0,
"Value": "camera"
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "VIRTUAL-SKIN-CPU-MID",
"Duration": 0,
"Value": "camera"
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "VIRTUAL-SKIN-CPU-HIGH",
"Duration": 0,
"Value": "camera"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PowerHALCameraRunning",
@ -1913,6 +1943,18 @@
"Duration": 0,
"Value": "camera"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "VIRTUAL-SKIN-CPU-MID",
"Duration": 0,
"Value": "camera"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "VIRTUAL-SKIN-CPU-HIGH",
"Duration": 0,
"Value": "camera"
},
{
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "PowerHALCameraRunning",

View file

@ -391,6 +391,26 @@
"Disabled":true
}
]
},
{
"Mode": "camera",
"BindedCdevInfo": [
{
"CdevRequest": "thermal-cpufreq-0",
"MaxReleaseStep": 1,
"Disabled":true
},
{
"CdevRequest": "thermal-cpufreq-1",
"MaxReleaseStep": 1,
"Disabled":true
},
{
"CdevRequest": "thermal-cpufreq-2",
"MaxReleaseStep": 1,
"Disabled":true
}
]
}
]
},
@ -436,7 +456,7 @@
},
{
"CdevRequest": "thermal-cpufreq-2",
"CdevWeightForPID": [0.252, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225],
"CdevWeightForPID": [0.225, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 13, 13, 13, 13, 13, 13]
@ -467,20 +487,26 @@
"Mode": "camera",
"BindedCdevInfo": [
{
"CdevRequest": "thermal-cpufreq-0",
"MaxReleaseStep": 1,
"Disabled":true
},
{
"CdevRequest": "thermal-cpufreq-1",
"MaxReleaseStep": 1,
"Disabled":true
},
{
"CdevRequest": "thermal-cpufreq-2",
"MaxReleaseStep": 1,
"Disabled":true
}
"CdevRequest": "thermal-cpufreq-0",
"CdevWeightForPID": [0.156, 0.156, 0.156, 0.156, 0.156, 0.156, 0.156],
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"CdevCeiling": [0, 6, 6, 6, 6, 6, 6]
},
{
"CdevRequest": "thermal-cpufreq-1",
"CdevWeightForPID": [0.428, 0.428, 0.428, 0.428, 0.428, 0.428, 0.428],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 9, 9, 9, 9, 9, 9]
},
{
"CdevRequest": "thermal-cpufreq-2",
"CdevWeightForPID": [0.225, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 12, 12, 12, 12, 12, 12]
}
]
}
]

View file

@ -381,6 +381,26 @@
"Disabled":true
}
]
},
{
"Mode": "camera",
"BindedCdevInfo": [
{
"CdevRequest": "thermal-cpufreq-0",
"MaxReleaseStep": 1,
"Disabled":true
},
{
"CdevRequest": "thermal-cpufreq-1",
"MaxReleaseStep": 1,
"Disabled":true
},
{
"CdevRequest": "thermal-cpufreq-2",
"MaxReleaseStep": 1,
"Disabled":true
}
]
}
]
},
@ -426,7 +446,7 @@
},
{
"CdevRequest": "thermal-cpufreq-2",
"CdevWeightForPID": [0.252, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225],
"CdevWeightForPID": [0.225, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 13, 13, 13, 13, 13, 13]
@ -457,20 +477,26 @@
"Mode": "camera",
"BindedCdevInfo": [
{
"CdevRequest": "thermal-cpufreq-0",
"MaxReleaseStep": 1,
"Disabled":true
},
{
"CdevRequest": "thermal-cpufreq-1",
"MaxReleaseStep": 1,
"Disabled":true
},
{
"CdevRequest": "thermal-cpufreq-2",
"MaxReleaseStep": 1,
"Disabled":true
}
"CdevRequest": "thermal-cpufreq-0",
"CdevWeightForPID": [0.156, 0.156, 0.156, 0.156, 0.156, 0.156, 0.156],
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"CdevCeiling": [0, 6, 6, 6, 6, 6, 6]
},
{
"CdevRequest": "thermal-cpufreq-1",
"CdevWeightForPID": [0.428, 0.428, 0.428, 0.428, 0.428, 0.428, 0.428],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 9, 9, 9, 9, 9, 9]
},
{
"CdevRequest": "thermal-cpufreq-2",
"CdevWeightForPID": [0.225, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 12, 12, 12, 12, 12, 12]
}
]
}
]

View file

@ -413,6 +413,26 @@
"Disabled":true
}
]
},
{
"Mode": "camera",
"BindedCdevInfo": [
{
"CdevRequest": "thermal-cpufreq-0",
"MaxReleaseStep": 1,
"Disabled":true
},
{
"CdevRequest": "thermal-cpufreq-1",
"MaxReleaseStep": 1,
"Disabled":true
},
{
"CdevRequest": "thermal-cpufreq-2",
"MaxReleaseStep": 1,
"Disabled":true
}
]
}
]
},
@ -458,7 +478,7 @@
},
{
"CdevRequest": "thermal-cpufreq-2",
"CdevWeightForPID": [0.252, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225],
"CdevWeightForPID": [0.225, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 13, 13, 13, 13, 13, 13]
@ -486,25 +506,26 @@
]
},
{
"Mode": "camera",
"BindedCdevInfo": [
{
"CdevRequest": "thermal-cpufreq-0",
"MaxReleaseStep": 1,
"Disabled":true
},
{
"CdevRequest": "thermal-cpufreq-1",
"MaxReleaseStep": 1,
"Disabled":true
},
{
"CdevRequest": "thermal-cpufreq-2",
"MaxReleaseStep": 1,
"Disabled":true
}
]
}
"CdevRequest": "thermal-cpufreq-0",
"CdevWeightForPID": [0.156, 0.156, 0.156, 0.156, 0.156, 0.156, 0.156],
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"CdevCeiling": [0, 6, 6, 6, 6, 6, 6]
},
{
"CdevRequest": "thermal-cpufreq-1",
"CdevWeightForPID": [0.428, 0.428, 0.428, 0.428, 0.428, 0.428, 0.428],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 9, 9, 9, 9, 9, 9]
},
{
"CdevRequest": "thermal-cpufreq-2",
"CdevWeightForPID": [0.225, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 12, 12, 12, 12, 12, 12]
}
]
},
{

View file

@ -414,6 +414,26 @@
"Disabled":true
}
]
},
{
"Mode": "camera",
"BindedCdevInfo": [
{
"CdevRequest": "thermal-cpufreq-0",
"MaxReleaseStep": 1,
"Disabled":true
},
{
"CdevRequest": "thermal-cpufreq-1",
"MaxReleaseStep": 1,
"Disabled":true
},
{
"CdevRequest": "thermal-cpufreq-2",
"MaxReleaseStep": 1,
"Disabled":true
}
]
}
]
},
@ -459,7 +479,7 @@
},
{
"CdevRequest": "thermal-cpufreq-2",
"CdevWeightForPID": [0.252, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225],
"CdevWeightForPID": [0.225, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 13, 13, 13, 13, 13, 13]
@ -490,20 +510,26 @@
"Mode": "camera",
"BindedCdevInfo": [
{
"CdevRequest": "thermal-cpufreq-0",
"MaxReleaseStep": 1,
"Disabled":true
},
{
"CdevRequest": "thermal-cpufreq-1",
"MaxReleaseStep": 1,
"Disabled":true
},
{
"CdevRequest": "thermal-cpufreq-2",
"MaxReleaseStep": 1,
"Disabled":true
}
"CdevRequest": "thermal-cpufreq-0",
"CdevWeightForPID": [0.156, 0.156, 0.156, 0.156, 0.156, 0.156, 0.156],
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"CdevCeiling": [0, 6, 6, 6, 6, 6, 6]
},
{
"CdevRequest": "thermal-cpufreq-1",
"CdevWeightForPID": [0.428, 0.428, 0.428, 0.428, 0.428, 0.428, 0.428],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 9, 9, 9, 9, 9, 9]
},
{
"CdevRequest": "thermal-cpufreq-2",
"CdevWeightForPID": [0.225, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 12, 12, 12, 12, 12, 12]
}
]
}
]

View file

@ -358,6 +358,26 @@
"Disabled":true
}
]
},
{
"Mode": "camera",
"BindedCdevInfo": [
{
"CdevRequest": "thermal-cpufreq-0",
"MaxReleaseStep": 1,
"Disabled":true
},
{
"CdevRequest": "thermal-cpufreq-1",
"MaxReleaseStep": 1,
"Disabled":true
},
{
"CdevRequest": "thermal-cpufreq-2",
"MaxReleaseStep": 1,
"Disabled":true
}
]
}
]
},
@ -403,7 +423,7 @@
},
{
"CdevRequest": "thermal-cpufreq-2",
"CdevWeightForPID": [0.252, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225],
"CdevWeightForPID": [0.225, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 13, 13, 13, 13, 13, 13]
@ -434,20 +454,26 @@
"Mode": "camera",
"BindedCdevInfo": [
{
"CdevRequest": "thermal-cpufreq-0",
"MaxReleaseStep": 1,
"Disabled":true
},
{
"CdevRequest": "thermal-cpufreq-1",
"MaxReleaseStep": 1,
"Disabled":true
},
{
"CdevRequest": "thermal-cpufreq-2",
"MaxReleaseStep": 1,
"Disabled":true
}
"CdevRequest": "thermal-cpufreq-0",
"CdevWeightForPID": [0.156, 0.156, 0.156, 0.156, 0.156, 0.156, 0.156],
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"CdevCeiling": [0, 6, 6, 6, 6, 6, 6]
},
{
"CdevRequest": "thermal-cpufreq-1",
"CdevWeightForPID": [0.428, 0.428, 0.428, 0.428, 0.428, 0.428, 0.428],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 9, 9, 9, 9, 9, 9]
},
{
"CdevRequest": "thermal-cpufreq-2",
"CdevWeightForPID": [0.225, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 12, 12, 12, 12, 12, 12]
}
]
}
]

View file

@ -360,6 +360,26 @@
"Disabled":true
}
]
},
{
"Mode": "camera",
"BindedCdevInfo": [
{
"CdevRequest": "thermal-cpufreq-0",
"MaxReleaseStep": 1,
"Disabled":true
},
{
"CdevRequest": "thermal-cpufreq-1",
"MaxReleaseStep": 1,
"Disabled":true
},
{
"CdevRequest": "thermal-cpufreq-2",
"MaxReleaseStep": 1,
"Disabled":true
}
]
}
]
},
@ -405,7 +425,7 @@
},
{
"CdevRequest": "thermal-cpufreq-2",
"CdevWeightForPID": [0.252, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225],
"CdevWeightForPID": [0.225, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 13, 13, 13, 13, 13, 13]
@ -436,20 +456,26 @@
"Mode": "camera",
"BindedCdevInfo": [
{
"CdevRequest": "thermal-cpufreq-0",
"MaxReleaseStep": 1,
"Disabled":true
},
{
"CdevRequest": "thermal-cpufreq-1",
"MaxReleaseStep": 1,
"Disabled":true
},
{
"CdevRequest": "thermal-cpufreq-2",
"MaxReleaseStep": 1,
"Disabled":true
}
"CdevRequest": "thermal-cpufreq-0",
"CdevWeightForPID": [0.156, 0.156, 0.156, 0.156, 0.156, 0.156, 0.156],
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"CdevCeiling": [0, 6, 6, 6, 6, 6, 6]
},
{
"CdevRequest": "thermal-cpufreq-1",
"CdevWeightForPID": [0.428, 0.428, 0.428, 0.428, 0.428, 0.428, 0.428],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 9, 9, 9, 9, 9, 9]
},
{
"CdevRequest": "thermal-cpufreq-2",
"CdevWeightForPID": [0.225, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 12, 12, 12, 12, 12, 12]
}
]
}
]