From 1499e8335eb3026a19517e8638e4c58cbacb9a37 Mon Sep 17 00:00:00 2001
From: Qais Yousef <qyousef@google.com>
Date: Wed, 10 May 2023 10:45:59 +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.

Bug: 261705301
Signed-off-by: Qais Yousef <qyousef@google.com>
Change-Id: Ieee72bbec5e9dd1cceff02ea82c73ccf85fe9358
---
 powerhint-oriole.json   | 16 ++++++++++++++++
 powerhint-raven.json    | 16 ++++++++++++++++
 powerhint-slider.json   | 16 ++++++++++++++++
 powerhint-whitefin.json | 16 ++++++++++++++++
 4 files changed, 64 insertions(+)

diff --git a/powerhint-oriole.json b/powerhint-oriole.json
index 9ec6a0e..1069ca1 100644
--- a/powerhint-oriole.json
+++ b/powerhint-oriole.json
@@ -130,6 +130,16 @@
       "DefaultIndex": 0,
       "ResetOnInit": true
     },
+    {
+      "Name": "CPUDVFSHeadroom",
+      "Path": "/proc/vendor_sched/dvfs_headroom",
+      "Values": [
+        "1280",
+        "1100"
+      ],
+      "DefaultIndex": 0,
+      "ResetOnInit": true
+    },
     {
       "Name": "TAUClampBoost",
       "Path": "/proc/vendor_sched/ta_uclamp_min",
@@ -947,6 +957,12 @@
       "Duration": 0,
       "Value": "1100"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_HIGH",
+      "Node": "CPUDVFSHeadroom",
+      "Duration": 0,
+      "Value": "1100"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "CPUMidClusterMaxFreq",
diff --git a/powerhint-raven.json b/powerhint-raven.json
index 46970f3..b068218 100644
--- a/powerhint-raven.json
+++ b/powerhint-raven.json
@@ -129,6 +129,16 @@
       "DefaultIndex": 0,
       "ResetOnInit": true
     },
+    {
+      "Name": "CPUDVFSHeadroom",
+      "Path": "/proc/vendor_sched/dvfs_headroom",
+      "Values": [
+        "1280",
+        "1100"
+      ],
+      "DefaultIndex": 0,
+      "ResetOnInit": true
+    },
     {
       "Name": "TAUClampBoost",
       "Path": "/proc/vendor_sched/ta_uclamp_min",
@@ -946,6 +956,12 @@
       "Duration": 0,
       "Value": "1100"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_HIGH",
+      "Node": "CPUDVFSHeadroom",
+      "Duration": 0,
+      "Value": "1100"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "CPUMidClusterMaxFreq",
diff --git a/powerhint-slider.json b/powerhint-slider.json
index 52c8cb3..bd5ab4c 100644
--- a/powerhint-slider.json
+++ b/powerhint-slider.json
@@ -129,6 +129,16 @@
       "DefaultIndex": 0,
       "ResetOnInit": true
     },
+    {
+      "Name": "CPUDVFSHeadroom",
+      "Path": "/proc/vendor_sched/dvfs_headroom",
+      "Values": [
+        "1280",
+        "1100"
+      ],
+      "DefaultIndex": 0,
+      "ResetOnInit": true
+    },
     {
       "Name": "MIFTargetLoad",
       "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load",
@@ -838,6 +848,12 @@
       "Duration": 0,
       "Value": "1100"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_HIGH",
+      "Node": "CPUDVFSHeadroom",
+      "Duration": 0,
+      "Value": "1100"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "CPUMidClusterMaxFreq",
diff --git a/powerhint-whitefin.json b/powerhint-whitefin.json
index fa470a9..cc335bc 100644
--- a/powerhint-whitefin.json
+++ b/powerhint-whitefin.json
@@ -129,6 +129,16 @@
       "DefaultIndex": 0,
       "ResetOnInit": true
     },
+    {
+      "Name": "CPUDVFSHeadroom",
+      "Path": "/proc/vendor_sched/dvfs_headroom",
+      "Values": [
+        "1280",
+        "1100"
+      ],
+      "DefaultIndex": 0,
+      "ResetOnInit": true
+    },
     {
       "Name": "MIFTargetLoad",
       "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load",
@@ -829,6 +839,12 @@
       "Duration": 0,
       "Value": "1100"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_HIGH",
+      "Node": "CPUDVFSHeadroom",
+      "Duration": 0,
+      "Value": "1100"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "CPUMidClusterMaxFreq",