From 7a77f284ec0e962d007140dfbb6d0967a1a7cd34 Mon Sep 17 00:00:00 2001
From: Qais Yousef <qyousef@google.com>
Date: Mon, 27 Feb 2023 15:23:36 +0000
Subject: [PATCH] powerhint.json: Update uclamp_min hint to account for margin

Upstream has fixed relationship between uclamp_min and margin which
means uclamp_min value between 80-100% of capacity of the CPU is a valid
value and will not cause upmigration.

To keep the current hints in powerhint.json the same, we must update
uclamp_min to be capacity_orig_of(medium_cpu) + 1.

This change is dependent on uclamp vs fits margin in GKI, vendor
modules. And an improvement in sched_pixel to ignore the 25% boost if
the only reason to request the frequency is uclamp_min.

To cater for the later - we multiply each uclamp_min value with 1.25
- except ones that look intentionally set around capacity boundaries.

Bug: 261695590
Test: PtsUiBench
Signed-off-by: Qais Yousef <qyousef@google.com>
Change-Id: I1e6889ebea9877cb23708722a73e97177e6be185
---
 powerhint.json | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/powerhint.json b/powerhint.json
index 350fe79..ba73ede 100644
--- a/powerhint.json
+++ b/powerhint.json
@@ -148,7 +148,7 @@
       "Name": "CAMUClampBoost",
       "Path": "/proc/vendor_sched/cam_uclamp_min",
       "Values": [
-        "612",
+        "764",
         "0"
       ],
       "ResetOnInit": true
@@ -157,7 +157,7 @@
       "Name": "TAUClampBoost",
       "Path": "/proc/vendor_sched/ta_uclamp_min",
       "Values": [
-        "612",
+        "764",
         "1"
       ],
       "ResetOnInit": true
@@ -175,8 +175,8 @@
       "Name": "MLUclampBoost",
       "Path": "/proc/vendor_sched/nnapi_uclamp_min",
       "Values": [
-          "180",
-          "650"
+          "225",
+          "813"
       ],
       "DefaultIndex": 0,
       "ResetOnInit": true
@@ -643,7 +643,7 @@
       "PowerHint": "LAUNCH",
       "Node": "TAUClampBoost",
       "Duration": 5000,
-      "Value": "612"
+      "Value": "764"
     },
     {
       "PowerHint": "LAUNCH",
@@ -773,7 +773,7 @@
       "PowerHint": "CAMERA_LAUNCH",
       "Node": "CAMUClampBoost",
       "Duration": 1000,
-      "Value": "612"
+      "Value": "764"
     },
     {
       "PowerHint": "CAMERA_LAUNCH",
@@ -1938,7 +1938,7 @@
       "PowerHint": "ML_ACC",
       "Node": "MLUclampBoost",
       "Duration": 2000,
-      "Value": "650"
+      "Value": "813"
     },
     {
       "PowerHint": "ML_ACC",
@@ -1960,8 +1960,8 @@
       "PID_Do": 500.0,
       "PID_Du": 0.0,
       "UclampMin_On": true,
-      "UclampMin_Init": 145,
-      "UclampMin_High": 411,
+      "UclampMin_Init": 182,
+      "UclampMin_High": 514,
       "UclampMin_Low": 2,
       "SamplingWindow_P": 1,
       "SamplingWindow_I": 0,
@@ -1987,9 +1987,9 @@
       "SamplingWindow_I": 1,
       "SamplingWindow_D": 1,
       "UclampMin_On": true,
-      "UclampMin_Init": 200,
-      "UclampMin_High": 157,
-      "UclampMin_Low": 157,
+      "UclampMin_Init": 250,
+      "UclampMin_High": 197,
+      "UclampMin_Low": 197,
       "ReportingRateLimitNs": 1,
       "EarlyBoost_On": false,
       "EarlyBoost_TimeFactor": 0.0,
@@ -2011,9 +2011,9 @@
       "SamplingWindow_I": 1,
       "SamplingWindow_D": 1,
       "UclampMin_On": true,
-      "UclampMin_Init": 200,
-      "UclampMin_High": 42,
-      "UclampMin_Low": 42,
+      "UclampMin_Init": 250,
+      "UclampMin_High": 53,
+      "UclampMin_Low": 53,
       "ReportingRateLimitNs": 1,
       "EarlyBoost_On": false,
       "EarlyBoost_TimeFactor": 0.0,
@@ -2035,7 +2035,7 @@
       "SamplingWindow_I": 1,
       "SamplingWindow_D": 1,
       "UclampMin_On": true,
-      "UclampMin_Init": 200,
+      "UclampMin_Init": 250,
       "UclampMin_High": 0,
       "UclampMin_Low": 0,
       "ReportingRateLimitNs": 1,