From d429c9d0087281b98b4c5e4a085ccef6a2f25842 Mon Sep 17 00:00:00 2001
From: paulsu <paulsu@google.com>
Date: Thu, 11 May 2023 07:32:31 +0000
Subject: [PATCH] The dvfs headroom was split into its own knob. Update to use
 it.

util_threshold only controls migration margin now. dvfs headroom has its
own new knob.

Test: Local run
Bug: 281792287
Change-Id: I828f943aab936b532f658dc6bf3acfc903b7fc02
Signed-off-by: paulsu <paulsu@google.com>
---
 perf/powerhint-husky.json      | 22 ++++++++++++++++++++++
 perf/powerhint-ripcurrent.json | 22 ++++++++++++++++++++++
 perf/powerhint-shiba.json      | 22 ++++++++++++++++++++++
 3 files changed, 66 insertions(+)

diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json
index 60e4fb7..145d1df 100644
--- a/perf/powerhint-husky.json
+++ b/perf/powerhint-husky.json
@@ -187,6 +187,16 @@
       "DefaultIndex": 0,
       "ResetOnInit": true
     },
+    {
+      "Name": "CPUDVFSHeadroom",
+      "Path": "/proc/vendor_sched/dvfs_headroom",
+      "Values": [
+        "1280",
+        "1100"
+      ],
+      "DefaultIndex": 0,
+      "ResetOnInit": true
+    },
     {
       "Name": "CAMUClampBoost",
       "Path": "/proc/vendor_sched/cam_uclamp_min",
@@ -1355,6 +1365,12 @@
       "Duration": 0,
       "Value": "1100"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_HIGH",
+      "Node": "CPUDVFSHeadroom",
+      "Duration": 0,
+      "Value": "1100"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "CDPreferHighCap",
@@ -1775,6 +1791,12 @@
       "Duration": 0,
       "Value": "1100"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
+      "Node": "CPUDVFSHeadroom",
+      "Duration": 0,
+      "Value": "1100"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
       "Node": "NPITaskPacking",
diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json
index f1e3bb9..2797170 100644
--- a/perf/powerhint-ripcurrent.json
+++ b/perf/powerhint-ripcurrent.json
@@ -177,6 +177,16 @@
       "DefaultIndex": 0,
       "ResetOnInit": true
     },
+    {
+      "Name": "CPUDVFSHeadroom",
+      "Path": "/proc/vendor_sched/dvfs_headroom",
+      "Values": [
+        "1280",
+        "1100"
+      ],
+      "DefaultIndex": 0,
+      "ResetOnInit": true
+    },
     {
       "Name": "CAMUClampBoost",
       "Path": "/proc/vendor_sched/cam_uclamp_min",
@@ -1243,6 +1253,12 @@
       "Duration": 0,
       "Value": "1100"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_HIGH",
+      "Node": "CPUDVFSHeadroom",
+      "Duration": 0,
+      "Value": "1100"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "CDPreferHighCap",
@@ -1663,6 +1679,12 @@
       "Duration": 0,
       "Value": "1100"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
+      "Node": "CPUDVFSHeadroom",
+      "Duration": 0,
+      "Value": "1100"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
       "Node": "NPITaskPacking",
diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json
index 41391c7..44b0ec5 100644
--- a/perf/powerhint-shiba.json
+++ b/perf/powerhint-shiba.json
@@ -177,6 +177,16 @@
       "DefaultIndex": 0,
       "ResetOnInit": true
     },
+    {
+      "Name": "CPUDVFSHeadroom",
+      "Path": "/proc/vendor_sched/dvfs_headroom",
+      "Values": [
+        "1280",
+        "1100"
+      ],
+      "DefaultIndex": 0,
+      "ResetOnInit": true
+    },
     {
       "Name": "CAMUClampBoost",
       "Path": "/proc/vendor_sched/cam_uclamp_min",
@@ -1243,6 +1253,12 @@
       "Duration": 0,
       "Value": "1100"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_HIGH",
+      "Node": "CPUDVFSHeadroom",
+      "Duration": 0,
+      "Value": "1100"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "CDPreferHighCap",
@@ -1663,6 +1679,12 @@
       "Duration": 0,
       "Value": "1100"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
+      "Node": "CPUDVFSHeadroom",
+      "Duration": 0,
+      "Value": "1100"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
       "Node": "NPITaskPacking",