From 73cd02795be0ece2eef822b4b5a60bac2e46494b Mon Sep 17 00:00:00 2001
From: Matt Buckley <mattbuckley@google.com>
Date: Thu, 14 Jul 2022 21:43:56 +0000
Subject: [PATCH] Remove existing surfaceflinger uclamp boost configuration

Remove existing surfaceflinger uclamp settings to not interfere with
new adpf cpu hints for surfaceflinger

Bug: 195990840

Test: manual
Change-Id: I763f1baec65f0cad341074f461a086776f7a5f5d
---
 conf/init.bluejay.rc |  8 ++++++++
 powerhint.json       | 22 ----------------------
 2 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/conf/init.bluejay.rc b/conf/init.bluejay.rc
index d2a278d..1ee067c 100644
--- a/conf/init.bluejay.rc
+++ b/conf/init.bluejay.rc
@@ -30,3 +30,11 @@ on property:ro.boot.hardware.sku=GB17L
 on property:sys.retaildemo.enabled=1
     setprop persist.vendor.charge.stop.level 35
     setprop persist.vendor.charge.start.level 30
+
+# Override SF and RE uclamps to 0 on boot after being set elsewhere, for adpf cpu hints
+on property:sys.boot_completed=1
+    trigger override-sf-uclamp
+
+on override-sf-uclamp
+    write /proc/vendor_sched/rt_uclamp_min 0
+    write /proc/vendor_sched/sf_uclamp_min 0
diff --git a/powerhint.json b/powerhint.json
index 70768b1..dd8eb09 100644
--- a/powerhint.json
+++ b/powerhint.json
@@ -157,16 +157,6 @@
       ],
       "ResetOnInit": true
     },
-    {
-      "Name": "SFUClampBoost",
-      "Path": "/proc/vendor_sched/sf_uclamp_min",
-      "Values": [
-        "161",
-        "85",
-        "39"
-      ],
-      "ResetOnInit": true
-    },
     {
       "Name": "MLUclampBoost",
       "Path": "/proc/vendor_sched/nnapi_uclamp_min",
@@ -475,12 +465,6 @@
     }
   ],
   "Actions": [
-    {
-      "PowerHint": "INTERACTION",
-      "Node": "SFUClampBoost",
-      "Duration": 5000,
-      "Value": "85"
-    },
     {
       "PowerHint": "LAUNCH",
       "Node": "UClampThreshold",
@@ -499,12 +483,6 @@
       "Duration": 5000,
       "Value": "1"
     },
-    {
-      "PowerHint": "LAUNCH",
-      "Node": "SFUClampBoost",
-      "Duration": 5000,
-      "Value": "85"
-    },
     {
       "PowerHint": "LAUNCH",
       "Node": "CPUBigClusterMaxFreq",