Change the default cpuset of camera daemon
Changing cpuset itself takes time, so we should reduce the cpuset
change as possible. Since all camera streaming mode change to the
same cpuset value, we could make it default setting.
Bug: 240889279
Test: build pass
Change-Id: I147acab52db5cbb99139cc7a677abf602e6ca519
diff --git a/powerhint-oriole.json b/powerhint-oriole.json
index 3a61b74..582586c 100644
--- a/powerhint-oriole.json
+++ b/powerhint-oriole.json
@@ -209,8 +209,7 @@
"Path": "/dev/cpuset/camera-daemon-high-group/cpus",
"Values": [
"0-3",
- "6-7",
- "0-7"
+ "6-7"
],
"ResetOnInit": true
},
@@ -219,8 +218,7 @@
"Path": "/dev/cpuset/camera-daemon-mid-group/cpus",
"Values": [
"0-3",
- "4-5",
- "0-7"
+ "4-5"
],
"ResetOnInit": true
},
@@ -229,8 +227,7 @@
"Path": "/dev/cpuset/camera-daemon-mid-high-group/cpus",
"Values": [
"0-3",
- "4-7",
- "0-7"
+ "4-7"
],
"ResetOnInit": true
},
@@ -673,17 +670,17 @@
},
{
"PowerHint": "CAMERA_LAUNCH",
- "Node": "CDCpuset",
- "Duration": 1000,
- "Value": "4-7"
- },
- {
- "PowerHint": "CAMERA_LAUNCH",
"Node": "NPITaskPacking",
"Duration": 1000,
"Value": "0"
},
{
+ "PowerHint": "CAMERA_LAUNCH",
+ "Node": "CDCpuset",
+ "Duration": 1000,
+ "Value": "4-7"
+ },
+ {
"PowerHint": "CAMERA_LAUNCH_EXTENDED",
"Node": "CPUBigClusterMaxFreq",
"Duration": 2000,
@@ -943,24 +940,6 @@
},
{
"PowerHint": "CAMERA_STREAMING_EXTREME",
- "Node": "CDHighCpusetCpus",
- "Duration": 0,
- "Value": "6-7"
- },
- {
- "PowerHint": "CAMERA_STREAMING_EXTREME",
- "Node": "CDMidCpusetCpus",
- "Duration": 0,
- "Value": "4-5"
- },
- {
- "PowerHint": "CAMERA_STREAMING_EXTREME",
- "Node": "CDMidHighCpusetCpus",
- "Duration": 0,
- "Value": "4-7"
- },
- {
- "PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "NPITaskPacking",
"Duration": 0,
"Value": "0"
@@ -1027,24 +1006,6 @@
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
- "Node": "CDHighCpusetCpus",
- "Duration": 0,
- "Value": "6-7"
- },
- {
- "PowerHint": "CAMERA_STREAMING_HIGH",
- "Node": "CDMidCpusetCpus",
- "Duration": 0,
- "Value": "4-5"
- },
- {
- "PowerHint": "CAMERA_STREAMING_HIGH",
- "Node": "CDMidHighCpusetCpus",
- "Duration": 0,
- "Value": "4-7"
- },
- {
- "PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "NPITaskPacking",
"Duration": 0,
"Value": "0"
@@ -1099,24 +1060,6 @@
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
- "Node": "CDHighCpusetCpus",
- "Duration": 0,
- "Value": "6-7"
- },
- {
- "PowerHint": "CAMERA_STREAMING_STANDARD",
- "Node": "CDMidCpusetCpus",
- "Duration": 0,
- "Value": "4-5"
- },
- {
- "PowerHint": "CAMERA_STREAMING_STANDARD",
- "Node": "CDMidHighCpusetCpus",
- "Duration": 0,
- "Value": "4-7"
- },
- {
- "PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "NPITaskPacking",
"Duration": 0,
"Value": "0"
@@ -1177,24 +1120,6 @@
},
{
"PowerHint": "CAMERA_STREAMING_LOW",
- "Node": "CDHighCpusetCpus",
- "Duration": 0,
- "Value": "6-7"
- },
- {
- "PowerHint": "CAMERA_STREAMING_LOW",
- "Node": "CDMidCpusetCpus",
- "Duration": 0,
- "Value": "4-5"
- },
- {
- "PowerHint": "CAMERA_STREAMING_LOW",
- "Node": "CDMidHighCpusetCpus",
- "Duration": 0,
- "Value": "4-7"
- },
- {
- "PowerHint": "CAMERA_STREAMING_LOW",
"Node": "NPITaskPacking",
"Duration": 0,
"Value": "0"
diff --git a/powerhint-raven.json b/powerhint-raven.json
index e174ac5..abb8ead 100644
--- a/powerhint-raven.json
+++ b/powerhint-raven.json
@@ -208,8 +208,7 @@
"Path": "/dev/cpuset/camera-daemon-high-group/cpus",
"Values": [
"0-3",
- "6-7",
- "0-7"
+ "6-7"
],
"ResetOnInit": true
},
@@ -218,8 +217,7 @@
"Path": "/dev/cpuset/camera-daemon-mid-group/cpus",
"Values": [
"0-3",
- "4-5",
- "0-7"
+ "4-5"
],
"ResetOnInit": true
},
@@ -228,8 +226,7 @@
"Path": "/dev/cpuset/camera-daemon-mid-high-group/cpus",
"Values": [
"0-3",
- "4-7",
- "0-7"
+ "4-7"
],
"ResetOnInit": true
},
@@ -672,17 +669,17 @@
},
{
"PowerHint": "CAMERA_LAUNCH",
- "Node": "CDCpuset",
- "Duration": 1000,
- "Value": "4-7"
- },
- {
- "PowerHint": "CAMERA_LAUNCH",
"Node": "NPITaskPacking",
"Duration": 1000,
"Value": "0"
},
{
+ "PowerHint": "CAMERA_LAUNCH",
+ "Node": "CDCpuset",
+ "Duration": 1000,
+ "Value": "4-7"
+ },
+ {
"PowerHint": "CAMERA_LAUNCH_EXTENDED",
"Node": "CPUBigClusterMaxFreq",
"Duration": 2000,
@@ -942,24 +939,6 @@
},
{
"PowerHint": "CAMERA_STREAMING_EXTREME",
- "Node": "CDHighCpusetCpus",
- "Duration": 0,
- "Value": "6-7"
- },
- {
- "PowerHint": "CAMERA_STREAMING_EXTREME",
- "Node": "CDMidCpusetCpus",
- "Duration": 0,
- "Value": "4-5"
- },
- {
- "PowerHint": "CAMERA_STREAMING_EXTREME",
- "Node": "CDMidHighCpusetCpus",
- "Duration": 0,
- "Value": "4-7"
- },
- {
- "PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "NPITaskPacking",
"Duration": 0,
"Value": "0"
@@ -1026,24 +1005,6 @@
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
- "Node": "CDHighCpusetCpus",
- "Duration": 0,
- "Value": "6-7"
- },
- {
- "PowerHint": "CAMERA_STREAMING_HIGH",
- "Node": "CDMidCpusetCpus",
- "Duration": 0,
- "Value": "4-5"
- },
- {
- "PowerHint": "CAMERA_STREAMING_HIGH",
- "Node": "CDMidHighCpusetCpus",
- "Duration": 0,
- "Value": "4-7"
- },
- {
- "PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "NPITaskPacking",
"Duration": 0,
"Value": "0"
@@ -1098,24 +1059,6 @@
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
- "Node": "CDHighCpusetCpus",
- "Duration": 0,
- "Value": "6-7"
- },
- {
- "PowerHint": "CAMERA_STREAMING_STANDARD",
- "Node": "CDMidCpusetCpus",
- "Duration": 0,
- "Value": "4-5"
- },
- {
- "PowerHint": "CAMERA_STREAMING_STANDARD",
- "Node": "CDMidHighCpusetCpus",
- "Duration": 0,
- "Value": "4-7"
- },
- {
- "PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "NPITaskPacking",
"Duration": 0,
"Value": "0"
@@ -1176,24 +1119,6 @@
},
{
"PowerHint": "CAMERA_STREAMING_LOW",
- "Node": "CDHighCpusetCpus",
- "Duration": 0,
- "Value": "6-7"
- },
- {
- "PowerHint": "CAMERA_STREAMING_LOW",
- "Node": "CDMidCpusetCpus",
- "Duration": 0,
- "Value": "4-5"
- },
- {
- "PowerHint": "CAMERA_STREAMING_LOW",
- "Node": "CDMidHighCpusetCpus",
- "Duration": 0,
- "Value": "4-7"
- },
- {
- "PowerHint": "CAMERA_STREAMING_LOW",
"Node": "NPITaskPacking",
"Duration": 0,
"Value": "0"