Limit camera daemon cpuset to little cores when app launch
When exiting camera app, camera daemon is still busy in background,
which may affect the launch animation of launcher. So, limit the cpuset
of camera daemon to little cores for 1 second when there is app launch
hint to improve it. This only happens when camera is running. Also
bypass this behavior when video recording is active.
Bug: 240889279
Test: camera daemon cpuset changed as expected
Change-Id: I1893980f0fc3de265a71a3a028f356c7010eaba5
diff --git a/powerhint-oriole.json b/powerhint-oriole.json
index 1ad9bc8..c7a10b1 100644
--- a/powerhint-oriole.json
+++ b/powerhint-oriole.json
@@ -177,7 +177,7 @@
"ResetOnInit": true
},
{
- "Name": "ReduceRreferIdle",
+ "Name": "ReducePreferIdle",
"Path": "/proc/vendor_sched/reduce_prefer_idle",
"Values": [
"0",
@@ -207,6 +207,7 @@
"Name": "CDCpuset",
"Path": "/dev/cpuset/camera-daemon/cpus",
"Values": [
+ "0-3",
"4-7",
"0-7"
],
@@ -216,6 +217,7 @@
"Name": "CDHighCpusetCpus",
"Path": "/dev/cpuset/camera-daemon-high-group/cpus",
"Values": [
+ "0-3",
"6-7",
"0-7"
],
@@ -225,6 +227,7 @@
"Name": "CDMidCpusetCpus",
"Path": "/dev/cpuset/camera-daemon-mid-group/cpus",
"Values": [
+ "0-3",
"4-5",
"0-7"
],
@@ -234,6 +237,7 @@
"Name": "CDMidHighCpusetCpus",
"Path": "/dev/cpuset/camera-daemon-mid-high-group/cpus",
"Values": [
+ "0-3",
"4-7",
"0-7"
],
@@ -305,6 +309,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": [
@@ -488,6 +502,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,
@@ -495,7 +533,7 @@
},
{
"PowerHint": "LAUNCH",
- "Node": "ReduceRreferIdle",
+ "Node": "ReducePreferIdle",
"Duration": 5000,
"Value": "0"
},
@@ -559,6 +597,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,
@@ -836,6 +898,12 @@
},
{
"PowerHint": "CAMERA_STREAMING_EXTREME",
+ "Node": "PowerHALCameraRunning",
+ "Duration": 0,
+ "Value": "1"
+ },
+ {
+ "PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "CPULittleClusterMaxFreq",
"Duration": 0,
"Value": "1401000"
@@ -914,6 +982,12 @@
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
+ "Node": "PowerHALCameraRunning",
+ "Duration": 0,
+ "Value": "1"
+ },
+ {
+ "PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "CPUUtilThreshold",
"Duration": 0,
"Value": "1100"
@@ -998,6 +1072,12 @@
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
+ "Node": "PowerHALCameraRunning",
+ "Duration": 0,
+ "Value": "1"
+ },
+ {
+ "PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CDPreferHighCap",
"Duration": 0,
"Value": "1"
@@ -1070,6 +1150,12 @@
},
{
"PowerHint": "CAMERA_STREAMING_LOW",
+ "Node": "PowerHALCameraRunning",
+ "Duration": 0,
+ "Value": "1"
+ },
+ {
+ "PowerHint": "CAMERA_STREAMING_LOW",
"Node": "CDPreferHighCap",
"Duration": 0,
"Value": "1"
@@ -1147,6 +1233,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 85c9284..77e9a45 100644
--- a/powerhint-raven.json
+++ b/powerhint-raven.json
@@ -176,7 +176,7 @@
"ResetOnInit": true
},
{
- "Name": "ReduceRreferIdle",
+ "Name": "ReducePreferIdle",
"Path": "/proc/vendor_sched/reduce_prefer_idle",
"Values": [
"0",
@@ -206,6 +206,7 @@
"Name": "CDCpuset",
"Path": "/dev/cpuset/camera-daemon/cpus",
"Values": [
+ "0-3",
"4-7",
"0-7"
],
@@ -215,6 +216,7 @@
"Name": "CDHighCpusetCpus",
"Path": "/dev/cpuset/camera-daemon-high-group/cpus",
"Values": [
+ "0-3",
"6-7",
"0-7"
],
@@ -224,6 +226,7 @@
"Name": "CDMidCpusetCpus",
"Path": "/dev/cpuset/camera-daemon-mid-group/cpus",
"Values": [
+ "0-3",
"4-5",
"0-7"
],
@@ -233,6 +236,7 @@
"Name": "CDMidHighCpusetCpus",
"Path": "/dev/cpuset/camera-daemon-mid-high-group/cpus",
"Values": [
+ "0-3",
"4-7",
"0-7"
],
@@ -304,6 +308,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": [
@@ -487,6 +501,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,
@@ -494,7 +532,7 @@
},
{
"PowerHint": "LAUNCH",
- "Node": "ReduceRreferIdle",
+ "Node": "ReducePreferIdle",
"Duration": 5000,
"Value": "0"
},
@@ -558,6 +596,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,
@@ -835,6 +897,12 @@
},
{
"PowerHint": "CAMERA_STREAMING_EXTREME",
+ "Node": "PowerHALCameraRunning",
+ "Duration": 0,
+ "Value": "1"
+ },
+ {
+ "PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "CPULittleClusterMaxFreq",
"Duration": 0,
"Value": "1401000"
@@ -913,6 +981,12 @@
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
+ "Node": "PowerHALCameraRunning",
+ "Duration": 0,
+ "Value": "1"
+ },
+ {
+ "PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "CPUUtilThreshold",
"Duration": 0,
"Value": "1100"
@@ -997,6 +1071,12 @@
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
+ "Node": "PowerHALCameraRunning",
+ "Duration": 0,
+ "Value": "1"
+ },
+ {
+ "PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CDPreferHighCap",
"Duration": 0,
"Value": "1"
@@ -1069,6 +1149,12 @@
},
{
"PowerHint": "CAMERA_STREAMING_LOW",
+ "Node": "PowerHALCameraRunning",
+ "Duration": 0,
+ "Value": "1"
+ },
+ {
+ "PowerHint": "CAMERA_STREAMING_LOW",
"Node": "CDPreferHighCap",
"Duration": 0,
"Value": "1"
@@ -1146,6 +1232,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,