Limit camera daemon cpuset to little cores when app launch am: 535ec9d6c1 am: bf8d08ec4e

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

Change-Id: Ieb5d5f17ff91297238836569c0022946f41d8924
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Rick Yiu 2022-11-18 07:18:10 +00:00 committed by Automerger Merge Worker
commit 94271d3573
2 changed files with 216 additions and 4 deletions

View file

@ -168,7 +168,7 @@
"ResetOnInit": true "ResetOnInit": true
}, },
{ {
"Name": "ReduceRreferIdle", "Name": "ReducePreferIdle",
"Path": "/proc/vendor_sched/reduce_prefer_idle", "Path": "/proc/vendor_sched/reduce_prefer_idle",
"Values": [ "Values": [
"0", "0",
@ -198,6 +198,7 @@
"Name": "CDCpuset", "Name": "CDCpuset",
"Path": "/dev/cpuset/camera-daemon/cpus", "Path": "/dev/cpuset/camera-daemon/cpus",
"Values": [ "Values": [
"0-3",
"4-7", "4-7",
"0-7" "0-7"
], ],
@ -207,6 +208,7 @@
"Name": "CDHighCpusetCpus", "Name": "CDHighCpusetCpus",
"Path": "/dev/cpuset/camera-daemon-high-group/cpus", "Path": "/dev/cpuset/camera-daemon-high-group/cpus",
"Values": [ "Values": [
"0-3",
"6-7", "6-7",
"0-7" "0-7"
], ],
@ -216,6 +218,7 @@
"Name": "CDMidCpusetCpus", "Name": "CDMidCpusetCpus",
"Path": "/dev/cpuset/camera-daemon-mid-group/cpus", "Path": "/dev/cpuset/camera-daemon-mid-group/cpus",
"Values": [ "Values": [
"0-3",
"4-5", "4-5",
"0-7" "0-7"
], ],
@ -225,6 +228,7 @@
"Name": "CDMidHighCpusetCpus", "Name": "CDMidHighCpusetCpus",
"Path": "/dev/cpuset/camera-daemon-mid-high-group/cpus", "Path": "/dev/cpuset/camera-daemon-mid-high-group/cpus",
"Values": [ "Values": [
"0-3",
"4-7", "4-7",
"0-7" "0-7"
], ],
@ -295,6 +299,16 @@
], ],
"Type": "Property" "Type": "Property"
}, },
{
"Name": "PowerHALCameraRunning",
"Path": "vendor.powerhal.camerarunning",
"Values": [
"1",
"0"
],
"Type": "Property",
"ResetOnInit": true
},
{ {
"Name": "INTCAMFreq", "Name": "INTCAMFreq",
"Path": "/sys/devices/platform/17000030.devfreq_intcam/devfreq/17000030.devfreq_intcam/min_freq", "Path": "/sys/devices/platform/17000030.devfreq_intcam/devfreq/17000030.devfreq_intcam/min_freq",
@ -478,6 +492,30 @@
} }
], ],
"Actions": [ "Actions": [
{
"PowerHint": "CDCPUSET_RESTRICTED",
"Node": "CDCpuset",
"Duration": 1000,
"Value": "0-3"
},
{
"PowerHint": "CDHIGHCPUSETCPUS_RESTRICTED",
"Node": "CDHighCpusetCpus",
"Duration": 1000,
"Value": "0-3"
},
{
"PowerHint": "CDMIDCPUSETCPUS_RESTRICTED",
"Node": "CDMidCpusetCpus",
"Duration": 1000,
"Value": "0-3"
},
{
"PowerHint": "CDMIDHIGHCPUSETCPUS_RESTRICTED",
"Node": "CDMidHighCpusetCpus",
"Duration": 1000,
"Value": "0-3"
},
{ {
"PowerHint": "LAUNCH", "PowerHint": "LAUNCH",
"Node": "UClampThreshold", "Node": "UClampThreshold",
@ -486,7 +524,7 @@
}, },
{ {
"PowerHint": "LAUNCH", "PowerHint": "LAUNCH",
"Node": "ReduceRreferIdle", "Node": "ReducePreferIdle",
"Duration": 5000, "Duration": 5000,
"Value": "0" "Value": "0"
}, },
@ -549,6 +587,30 @@
"Type": "DoHint", "Type": "DoHint",
"Value": "LAUNCH_EXTEND" "Value": "LAUNCH_EXTEND"
}, },
{
"PowerHint": "LAUNCH",
"Type": "DoHint",
"EnableProperty": "vendor.powerhal.camerarunning",
"Value": "CDCPUSET_RESTRICTED"
},
{
"PowerHint": "LAUNCH",
"Type": "DoHint",
"EnableProperty": "vendor.powerhal.camerarunning",
"Value": "CDHIGHCPUSETCPUS_RESTRICTED"
},
{
"PowerHint": "LAUNCH",
"Type": "DoHint",
"EnableProperty": "vendor.powerhal.camerarunning",
"Value": "CDMIDCPUSETCPUS_RESTRICTED"
},
{
"PowerHint": "LAUNCH",
"Type": "DoHint",
"EnableProperty": "vendor.powerhal.camerarunning",
"Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED"
},
{ {
"PowerHint": "LAUNCH_EXTEND", "PowerHint": "LAUNCH_EXTEND",
"Node": "CPUBigClusterMaxFreq", "Node": "CPUBigClusterMaxFreq",
@ -825,6 +887,12 @@
"Duration": 3000, "Duration": 3000,
"Value": "9999999" "Value": "9999999"
}, },
{
"PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "PowerHALCameraRunning",
"Duration": 0,
"Value": "1"
},
{ {
"PowerHint": "CAMERA_STREAMING_EXTREME", "PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "CPULittleClusterMaxFreq", "Node": "CPULittleClusterMaxFreq",
@ -897,6 +965,12 @@
"Duration": 0, "Duration": 0,
"Value": "0" "Value": "0"
}, },
{
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "PowerHALCameraRunning",
"Duration": 0,
"Value": "1"
},
{ {
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "CPUUtilThreshold", "Node": "CPUUtilThreshold",
@ -975,6 +1049,12 @@
"Duration": 0, "Duration": 0,
"Value": "0" "Value": "0"
}, },
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PowerHALCameraRunning",
"Duration": 0,
"Value": "1"
},
{ {
"PowerHint": "CAMERA_STREAMING_STANDARD", "PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CDPreferHighCap", "Node": "CDPreferHighCap",
@ -1041,6 +1121,12 @@
"Duration": 0, "Duration": 0,
"Value": "0" "Value": "0"
}, },
{
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "PowerHALCameraRunning",
"Duration": 0,
"Value": "1"
},
{ {
"PowerHint": "CAMERA_STREAMING_LOW", "PowerHint": "CAMERA_STREAMING_LOW",
"Node": "CDPreferHighCap", "Node": "CDPreferHighCap",
@ -1113,6 +1199,26 @@
"Duration": 0, "Duration": 0,
"Value": "0" "Value": "0"
}, },
{
"PowerHint": "CAMERA_VIDEO_RECORDING",
"Type": "MaskHint",
"Value": "CDCPUSET_RESTRICTED"
},
{
"PowerHint": "CAMERA_VIDEO_RECORDING",
"Type": "MaskHint",
"Value": "CDHIGHCPUSETCPUS_RESTRICTED"
},
{
"PowerHint": "CAMERA_VIDEO_RECORDING",
"Type": "MaskHint",
"Value": "CDMIDCPUSETCPUS_RESTRICTED"
},
{
"PowerHint": "CAMERA_VIDEO_RECORDING",
"Type": "MaskHint",
"Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED"
},
{ {
"PowerHint": "CAMERA_FIXED_FPS", "PowerHint": "CAMERA_FIXED_FPS",
"Node": "MemFreq", "Node": "MemFreq",

View file

@ -167,7 +167,7 @@
"ResetOnInit": true "ResetOnInit": true
}, },
{ {
"Name": "ReduceRreferIdle", "Name": "ReducePreferIdle",
"Path": "/proc/vendor_sched/reduce_prefer_idle", "Path": "/proc/vendor_sched/reduce_prefer_idle",
"Values": [ "Values": [
"0", "0",
@ -197,6 +197,7 @@
"Name": "CDCpuset", "Name": "CDCpuset",
"Path": "/dev/cpuset/camera-daemon/cpus", "Path": "/dev/cpuset/camera-daemon/cpus",
"Values": [ "Values": [
"0-3",
"4-7", "4-7",
"0-7" "0-7"
], ],
@ -206,6 +207,7 @@
"Name": "CDHighCpusetCpus", "Name": "CDHighCpusetCpus",
"Path": "/dev/cpuset/camera-daemon-high-group/cpus", "Path": "/dev/cpuset/camera-daemon-high-group/cpus",
"Values": [ "Values": [
"0-3",
"6-7", "6-7",
"0-7" "0-7"
], ],
@ -215,6 +217,7 @@
"Name": "CDMidCpusetCpus", "Name": "CDMidCpusetCpus",
"Path": "/dev/cpuset/camera-daemon-mid-group/cpus", "Path": "/dev/cpuset/camera-daemon-mid-group/cpus",
"Values": [ "Values": [
"0-3",
"4-5", "4-5",
"0-7" "0-7"
], ],
@ -224,6 +227,7 @@
"Name": "CDMidHighCpusetCpus", "Name": "CDMidHighCpusetCpus",
"Path": "/dev/cpuset/camera-daemon-mid-high-group/cpus", "Path": "/dev/cpuset/camera-daemon-mid-high-group/cpus",
"Values": [ "Values": [
"0-3",
"4-7", "4-7",
"0-7" "0-7"
], ],
@ -294,6 +298,16 @@
], ],
"Type": "Property" "Type": "Property"
}, },
{
"Name": "PowerHALCameraRunning",
"Path": "vendor.powerhal.camerarunning",
"Values": [
"1",
"0"
],
"Type": "Property",
"ResetOnInit": true
},
{ {
"Name": "INTCAMFreq", "Name": "INTCAMFreq",
"Path": "/sys/devices/platform/17000030.devfreq_intcam/devfreq/17000030.devfreq_intcam/min_freq", "Path": "/sys/devices/platform/17000030.devfreq_intcam/devfreq/17000030.devfreq_intcam/min_freq",
@ -477,6 +491,30 @@
} }
], ],
"Actions": [ "Actions": [
{
"PowerHint": "CDCPUSET_RESTRICTED",
"Node": "CDCpuset",
"Duration": 1000,
"Value": "0-3"
},
{
"PowerHint": "CDHIGHCPUSETCPUS_RESTRICTED",
"Node": "CDHighCpusetCpus",
"Duration": 1000,
"Value": "0-3"
},
{
"PowerHint": "CDMIDCPUSETCPUS_RESTRICTED",
"Node": "CDMidCpusetCpus",
"Duration": 1000,
"Value": "0-3"
},
{
"PowerHint": "CDMIDHIGHCPUSETCPUS_RESTRICTED",
"Node": "CDMidHighCpusetCpus",
"Duration": 1000,
"Value": "0-3"
},
{ {
"PowerHint": "LAUNCH", "PowerHint": "LAUNCH",
"Node": "UClampThreshold", "Node": "UClampThreshold",
@ -485,7 +523,7 @@
}, },
{ {
"PowerHint": "LAUNCH", "PowerHint": "LAUNCH",
"Node": "ReduceRreferIdle", "Node": "ReducePreferIdle",
"Duration": 5000, "Duration": 5000,
"Value": "0" "Value": "0"
}, },
@ -548,6 +586,30 @@
"Type": "DoHint", "Type": "DoHint",
"Value": "LAUNCH_EXTEND" "Value": "LAUNCH_EXTEND"
}, },
{
"PowerHint": "LAUNCH",
"Type": "DoHint",
"EnableProperty": "vendor.powerhal.camerarunning",
"Value": "CDCPUSET_RESTRICTED"
},
{
"PowerHint": "LAUNCH",
"Type": "DoHint",
"EnableProperty": "vendor.powerhal.camerarunning",
"Value": "CDHIGHCPUSETCPUS_RESTRICTED"
},
{
"PowerHint": "LAUNCH",
"Type": "DoHint",
"EnableProperty": "vendor.powerhal.camerarunning",
"Value": "CDMIDCPUSETCPUS_RESTRICTED"
},
{
"PowerHint": "LAUNCH",
"Type": "DoHint",
"EnableProperty": "vendor.powerhal.camerarunning",
"Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED"
},
{ {
"PowerHint": "LAUNCH_EXTEND", "PowerHint": "LAUNCH_EXTEND",
"Node": "CPUBigClusterMaxFreq", "Node": "CPUBigClusterMaxFreq",
@ -824,6 +886,12 @@
"Duration": 3000, "Duration": 3000,
"Value": "9999999" "Value": "9999999"
}, },
{
"PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "PowerHALCameraRunning",
"Duration": 0,
"Value": "1"
},
{ {
"PowerHint": "CAMERA_STREAMING_EXTREME", "PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "CPULittleClusterMaxFreq", "Node": "CPULittleClusterMaxFreq",
@ -896,6 +964,12 @@
"Duration": 0, "Duration": 0,
"Value": "0" "Value": "0"
}, },
{
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "PowerHALCameraRunning",
"Duration": 0,
"Value": "1"
},
{ {
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "CPUUtilThreshold", "Node": "CPUUtilThreshold",
@ -974,6 +1048,12 @@
"Duration": 0, "Duration": 0,
"Value": "0" "Value": "0"
}, },
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PowerHALCameraRunning",
"Duration": 0,
"Value": "1"
},
{ {
"PowerHint": "CAMERA_STREAMING_STANDARD", "PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CDPreferHighCap", "Node": "CDPreferHighCap",
@ -1040,6 +1120,12 @@
"Duration": 0, "Duration": 0,
"Value": "0" "Value": "0"
}, },
{
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "PowerHALCameraRunning",
"Duration": 0,
"Value": "1"
},
{ {
"PowerHint": "CAMERA_STREAMING_LOW", "PowerHint": "CAMERA_STREAMING_LOW",
"Node": "CDPreferHighCap", "Node": "CDPreferHighCap",
@ -1112,6 +1198,26 @@
"Duration": 0, "Duration": 0,
"Value": "0" "Value": "0"
}, },
{
"PowerHint": "CAMERA_VIDEO_RECORDING",
"Type": "MaskHint",
"Value": "CDCPUSET_RESTRICTED"
},
{
"PowerHint": "CAMERA_VIDEO_RECORDING",
"Type": "MaskHint",
"Value": "CDHIGHCPUSETCPUS_RESTRICTED"
},
{
"PowerHint": "CAMERA_VIDEO_RECORDING",
"Type": "MaskHint",
"Value": "CDMIDCPUSETCPUS_RESTRICTED"
},
{
"PowerHint": "CAMERA_VIDEO_RECORDING",
"Type": "MaskHint",
"Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED"
},
{ {
"PowerHint": "FIXED_PERFORMANCE", "PowerHint": "FIXED_PERFORMANCE",
"Node": "CPUBigClusterMaxFreq", "Node": "CPUBigClusterMaxFreq",