From 456150ae9de6101d44c455974685dee77237cea8 Mon Sep 17 00:00:00 2001
From: "Ali K. Zadeh" <alikz@google.com>
Date: Tue, 9 Jan 2024 19:00:32 +0000
Subject: [PATCH] Use cam3 EM, and change CPU UtilThreshold, DVFSHeadroom,
 TAPreferHighCap for 30fps

This CL implements the suggestions in http://b/311011064#comment8 (except
for chaning the node affinities) for 30fps use-cases.

Bug: 311011064
Test: odpm/framedrops (http://b/311011064#comment25)
Change-Id: I62274049b2096353f9fe3c972338ed47fb99380b
---
 perf/powerhint-caiman.json        | 25 ++++++++++++++++++++-----
 perf/powerhint-komodo.json        | 25 ++++++++++++++++++++-----
 perf/powerhint-ripcurrentpro.json | 25 ++++++++++++++++++++-----
 perf/powerhint-tokay.json         | 25 ++++++++++++++++++++-----
 perf/powerhint-zuma.json          | 25 ++++++++++++++++++++-----
 5 files changed, 100 insertions(+), 25 deletions(-)

diff --git a/perf/powerhint-caiman.json b/perf/powerhint-caiman.json
index 152c4f9e..09a59f66 100644
--- a/perf/powerhint-caiman.json
+++ b/perf/powerhint-caiman.json
@@ -235,7 +235,8 @@
       "Path": "/proc/vendor_sched/util_threshold",
       "Values": [
         "1280",
-        "1100"
+        "1100",
+        "1100 1024 1100"
       ],
       "DefaultIndex": 0,
       "ResetOnInit": true
@@ -245,7 +246,8 @@
       "Path": "/proc/vendor_sched/dvfs_headroom",
       "Values": [
         "1280",
-        "1100"
+        "1100",
+        "1280 1100 1055"
       ],
       "DefaultIndex": 0,
       "ResetOnInit": true
@@ -621,7 +623,8 @@
       "Values": [
         "default",
         "cam1",
-        "cam2"
+        "cam2",
+        "cam3"
       ],
       "DefaultIndex": 0
     },
@@ -1849,7 +1852,19 @@
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "EM_Profile",
       "Duration": 0,
-      "Value": "cam1"
+      "Value": "cam3"
+    },
+    {
+      "PowerHint": "CAMERA_STREAMING_STANDARD",
+      "Node": "CPUUtilThreshold",
+      "Duration": 0,
+      "Value": "1100 1024 1100"
+    },
+    {
+      "PowerHint": "CAMERA_STREAMING_STANDARD",
+      "Node": "CPUDVFSHeadroom",
+      "Duration": 0,
+      "Value": "1280 1100 1055"
     },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
@@ -1867,7 +1882,7 @@
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "TAPreferHighCap",
       "Duration": 0,
-      "Value": "1"
+      "Value": "0"
     },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
diff --git a/perf/powerhint-komodo.json b/perf/powerhint-komodo.json
index 152c4f9e..09a59f66 100644
--- a/perf/powerhint-komodo.json
+++ b/perf/powerhint-komodo.json
@@ -235,7 +235,8 @@
       "Path": "/proc/vendor_sched/util_threshold",
       "Values": [
         "1280",
-        "1100"
+        "1100",
+        "1100 1024 1100"
       ],
       "DefaultIndex": 0,
       "ResetOnInit": true
@@ -245,7 +246,8 @@
       "Path": "/proc/vendor_sched/dvfs_headroom",
       "Values": [
         "1280",
-        "1100"
+        "1100",
+        "1280 1100 1055"
       ],
       "DefaultIndex": 0,
       "ResetOnInit": true
@@ -621,7 +623,8 @@
       "Values": [
         "default",
         "cam1",
-        "cam2"
+        "cam2",
+        "cam3"
       ],
       "DefaultIndex": 0
     },
@@ -1849,7 +1852,19 @@
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "EM_Profile",
       "Duration": 0,
-      "Value": "cam1"
+      "Value": "cam3"
+    },
+    {
+      "PowerHint": "CAMERA_STREAMING_STANDARD",
+      "Node": "CPUUtilThreshold",
+      "Duration": 0,
+      "Value": "1100 1024 1100"
+    },
+    {
+      "PowerHint": "CAMERA_STREAMING_STANDARD",
+      "Node": "CPUDVFSHeadroom",
+      "Duration": 0,
+      "Value": "1280 1100 1055"
     },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
@@ -1867,7 +1882,7 @@
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "TAPreferHighCap",
       "Duration": 0,
-      "Value": "1"
+      "Value": "0"
     },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
diff --git a/perf/powerhint-ripcurrentpro.json b/perf/powerhint-ripcurrentpro.json
index 152c4f9e..09a59f66 100644
--- a/perf/powerhint-ripcurrentpro.json
+++ b/perf/powerhint-ripcurrentpro.json
@@ -235,7 +235,8 @@
       "Path": "/proc/vendor_sched/util_threshold",
       "Values": [
         "1280",
-        "1100"
+        "1100",
+        "1100 1024 1100"
       ],
       "DefaultIndex": 0,
       "ResetOnInit": true
@@ -245,7 +246,8 @@
       "Path": "/proc/vendor_sched/dvfs_headroom",
       "Values": [
         "1280",
-        "1100"
+        "1100",
+        "1280 1100 1055"
       ],
       "DefaultIndex": 0,
       "ResetOnInit": true
@@ -621,7 +623,8 @@
       "Values": [
         "default",
         "cam1",
-        "cam2"
+        "cam2",
+        "cam3"
       ],
       "DefaultIndex": 0
     },
@@ -1849,7 +1852,19 @@
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "EM_Profile",
       "Duration": 0,
-      "Value": "cam1"
+      "Value": "cam3"
+    },
+    {
+      "PowerHint": "CAMERA_STREAMING_STANDARD",
+      "Node": "CPUUtilThreshold",
+      "Duration": 0,
+      "Value": "1100 1024 1100"
+    },
+    {
+      "PowerHint": "CAMERA_STREAMING_STANDARD",
+      "Node": "CPUDVFSHeadroom",
+      "Duration": 0,
+      "Value": "1280 1100 1055"
     },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
@@ -1867,7 +1882,7 @@
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "TAPreferHighCap",
       "Duration": 0,
-      "Value": "1"
+      "Value": "0"
     },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
diff --git a/perf/powerhint-tokay.json b/perf/powerhint-tokay.json
index 152c4f9e..09a59f66 100644
--- a/perf/powerhint-tokay.json
+++ b/perf/powerhint-tokay.json
@@ -235,7 +235,8 @@
       "Path": "/proc/vendor_sched/util_threshold",
       "Values": [
         "1280",
-        "1100"
+        "1100",
+        "1100 1024 1100"
       ],
       "DefaultIndex": 0,
       "ResetOnInit": true
@@ -245,7 +246,8 @@
       "Path": "/proc/vendor_sched/dvfs_headroom",
       "Values": [
         "1280",
-        "1100"
+        "1100",
+        "1280 1100 1055"
       ],
       "DefaultIndex": 0,
       "ResetOnInit": true
@@ -621,7 +623,8 @@
       "Values": [
         "default",
         "cam1",
-        "cam2"
+        "cam2",
+        "cam3"
       ],
       "DefaultIndex": 0
     },
@@ -1849,7 +1852,19 @@
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "EM_Profile",
       "Duration": 0,
-      "Value": "cam1"
+      "Value": "cam3"
+    },
+    {
+      "PowerHint": "CAMERA_STREAMING_STANDARD",
+      "Node": "CPUUtilThreshold",
+      "Duration": 0,
+      "Value": "1100 1024 1100"
+    },
+    {
+      "PowerHint": "CAMERA_STREAMING_STANDARD",
+      "Node": "CPUDVFSHeadroom",
+      "Duration": 0,
+      "Value": "1280 1100 1055"
     },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
@@ -1867,7 +1882,7 @@
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "TAPreferHighCap",
       "Duration": 0,
-      "Value": "1"
+      "Value": "0"
     },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
diff --git a/perf/powerhint-zuma.json b/perf/powerhint-zuma.json
index 9a4cb6c3..0b5b35a7 100644
--- a/perf/powerhint-zuma.json
+++ b/perf/powerhint-zuma.json
@@ -246,7 +246,8 @@
       "Path": "/proc/vendor_sched/util_threshold",
       "Values": [
         "1280",
-        "1100"
+        "1100",
+        "1100 1024 1100"
       ],
       "DefaultIndex": 0,
       "ResetOnInit": true
@@ -256,7 +257,8 @@
       "Path": "/proc/vendor_sched/dvfs_headroom",
       "Values": [
         "1280",
-        "1100"
+        "1100",
+        "1280 1100 1055"
       ],
       "DefaultIndex": 0,
       "ResetOnInit": true
@@ -631,7 +633,8 @@
       "Values": [
         "default",
         "cam1",
-        "cam2"
+        "cam2",
+        "cam3"
       ],
       "DefaultIndex": 0
     },
@@ -1859,7 +1862,19 @@
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "EM_Profile",
       "Duration": 0,
-      "Value": "cam1"
+      "Value": "cam3"
+    },
+    {
+      "PowerHint": "CAMERA_STREAMING_STANDARD",
+      "Node": "CPUUtilThreshold",
+      "Duration": 0,
+      "Value": "1100 1024 1100"
+    },
+    {
+      "PowerHint": "CAMERA_STREAMING_STANDARD",
+      "Node": "CPUDVFSHeadroom",
+      "Duration": 0,
+      "Value": "1280 1100 1055"
     },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
@@ -1877,7 +1892,7 @@
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "TAPreferHighCap",
       "Duration": 0,
-      "Value": "1"
+      "Value": "0"
     },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",