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>
diff --git a/powerhint-oriole.json b/powerhint-oriole.json
index bc8a2e0..3a61b74 100644
--- a/powerhint-oriole.json
+++ b/powerhint-oriole.json
@@ -168,7 +168,7 @@
"ResetOnInit": true
},
{
- "Name": "ReduceRreferIdle",
+ "Name": "ReducePreferIdle",
"Path": "/proc/vendor_sched/reduce_prefer_idle",
"Values": [
"0",
@@ -198,6 +198,7 @@
"Name": "CDCpuset",
"Path": "/dev/cpuset/camera-daemon/cpus",
"Values": [
+ "0-3",
"4-7",
"0-7"
],
@@ -207,6 +208,7 @@
"Name": "CDHighCpusetCpus",
"Path": "/dev/cpuset/camera-daemon-high-group/cpus",
"Values": [
+ "0-3",
"6-7",
"0-7"
],
@@ -216,6 +218,7 @@
"Name": "CDMidCpusetCpus",
"Path": "/dev/cpuset/camera-daemon-mid-group/cpus",
"Values": [
+ "0-3",
"4-5",
"0-7"
],
@@ -225,6 +228,7 @@
"Name": "CDMidHighCpusetCpus",
"Path": "/dev/cpuset/camera-daemon-mid-high-group/cpus",
"Values": [
+ "0-3",
"4-7",
"0-7"
],
@@ -296,6 +300,16 @@
"Type": "Property"
},
{
+ "Name": "PowerHALCameraRunning",
+ "Path": "vendor.powerhal.camerarunning",
+ "Values": [
+ "1",
+ "0"
+ ],
+ "Type": "Property",
+ "ResetOnInit": true
+ },
+ {
"Name": "INTCAMFreq",
"Path": "/sys/devices/platform/17000030.devfreq_intcam/devfreq/17000030.devfreq_intcam/min_freq",
"Values": [
@@ -479,6 +493,30 @@
],
"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",
"Node": "UClampThreshold",
"Duration": 5000,
@@ -486,7 +524,7 @@
},
{
"PowerHint": "LAUNCH",
- "Node": "ReduceRreferIdle",
+ "Node": "ReducePreferIdle",
"Duration": 5000,
"Value": "0"
},
@@ -550,6 +588,30 @@
"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",
"Node": "CPUBigClusterMaxFreq",
"Duration": 2000,
@@ -827,6 +889,12 @@
},
{
"PowerHint": "CAMERA_STREAMING_EXTREME",
+ "Node": "PowerHALCameraRunning",
+ "Duration": 0,
+ "Value": "1"
+ },
+ {
+ "PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "CPULittleClusterMaxFreq",
"Duration": 0,
"Value": "1401000"
@@ -899,6 +967,12 @@
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
+ "Node": "PowerHALCameraRunning",
+ "Duration": 0,
+ "Value": "1"
+ },
+ {
+ "PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "CPUUtilThreshold",
"Duration": 0,
"Value": "1100"
@@ -977,6 +1051,12 @@
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
+ "Node": "PowerHALCameraRunning",
+ "Duration": 0,
+ "Value": "1"
+ },
+ {
+ "PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CDPreferHighCap",
"Duration": 0,
"Value": "1"
@@ -1043,6 +1123,12 @@
},
{
"PowerHint": "CAMERA_STREAMING_LOW",
+ "Node": "PowerHALCameraRunning",
+ "Duration": 0,
+ "Value": "1"
+ },
+ {
+ "PowerHint": "CAMERA_STREAMING_LOW",
"Node": "CDPreferHighCap",
"Duration": 0,
"Value": "1"
@@ -1114,6 +1200,26 @@
"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",
"Node": "MemFreq",
"Duration": 4000,
diff --git a/powerhint-raven.json b/powerhint-raven.json
index 432232f..e174ac5 100644
--- a/powerhint-raven.json
+++ b/powerhint-raven.json
@@ -167,7 +167,7 @@
"ResetOnInit": true
},
{
- "Name": "ReduceRreferIdle",
+ "Name": "ReducePreferIdle",
"Path": "/proc/vendor_sched/reduce_prefer_idle",
"Values": [
"0",
@@ -197,6 +197,7 @@
"Name": "CDCpuset",
"Path": "/dev/cpuset/camera-daemon/cpus",
"Values": [
+ "0-3",
"4-7",
"0-7"
],
@@ -206,6 +207,7 @@
"Name": "CDHighCpusetCpus",
"Path": "/dev/cpuset/camera-daemon-high-group/cpus",
"Values": [
+ "0-3",
"6-7",
"0-7"
],
@@ -215,6 +217,7 @@
"Name": "CDMidCpusetCpus",
"Path": "/dev/cpuset/camera-daemon-mid-group/cpus",
"Values": [
+ "0-3",
"4-5",
"0-7"
],
@@ -224,6 +227,7 @@
"Name": "CDMidHighCpusetCpus",
"Path": "/dev/cpuset/camera-daemon-mid-high-group/cpus",
"Values": [
+ "0-3",
"4-7",
"0-7"
],
@@ -295,6 +299,16 @@
"Type": "Property"
},
{
+ "Name": "PowerHALCameraRunning",
+ "Path": "vendor.powerhal.camerarunning",
+ "Values": [
+ "1",
+ "0"
+ ],
+ "Type": "Property",
+ "ResetOnInit": true
+ },
+ {
"Name": "INTCAMFreq",
"Path": "/sys/devices/platform/17000030.devfreq_intcam/devfreq/17000030.devfreq_intcam/min_freq",
"Values": [
@@ -478,6 +492,30 @@
],
"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",
"Node": "UClampThreshold",
"Duration": 5000,
@@ -485,7 +523,7 @@
},
{
"PowerHint": "LAUNCH",
- "Node": "ReduceRreferIdle",
+ "Node": "ReducePreferIdle",
"Duration": 5000,
"Value": "0"
},
@@ -549,6 +587,30 @@
"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",
"Node": "CPUBigClusterMaxFreq",
"Duration": 2000,
@@ -826,6 +888,12 @@
},
{
"PowerHint": "CAMERA_STREAMING_EXTREME",
+ "Node": "PowerHALCameraRunning",
+ "Duration": 0,
+ "Value": "1"
+ },
+ {
+ "PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "CPULittleClusterMaxFreq",
"Duration": 0,
"Value": "1401000"
@@ -898,6 +966,12 @@
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
+ "Node": "PowerHALCameraRunning",
+ "Duration": 0,
+ "Value": "1"
+ },
+ {
+ "PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "CPUUtilThreshold",
"Duration": 0,
"Value": "1100"
@@ -976,6 +1050,12 @@
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
+ "Node": "PowerHALCameraRunning",
+ "Duration": 0,
+ "Value": "1"
+ },
+ {
+ "PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CDPreferHighCap",
"Duration": 0,
"Value": "1"
@@ -1042,6 +1122,12 @@
},
{
"PowerHint": "CAMERA_STREAMING_LOW",
+ "Node": "PowerHALCameraRunning",
+ "Duration": 0,
+ "Value": "1"
+ },
+ {
+ "PowerHint": "CAMERA_STREAMING_LOW",
"Node": "CDPreferHighCap",
"Duration": 0,
"Value": "1"
@@ -1113,6 +1199,26 @@
"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",
"Node": "CPUBigClusterMaxFreq",
"Duration": 0,