From 0f365e08b67aefc8519f224561ef4530460ad4b9 Mon Sep 17 00:00:00 2001
From: Matt Buckley <mattbuckley@google.com>
Date: Wed, 10 Aug 2022 18:59:17 +0000
Subject: [PATCH] Enable ADPF CPU hints for SF

Allow these devices to send CPU hints to PowerHAL from SF to reduce
drops and save power.

Bug: b/241152899
Bug: b/195990840

Test: manual
Change-Id: I915bf64a669c176e53542752760f21e3a696a57b
---
 conf/init.raviole.rc  |  8 ++++++++
 device-oriole.mk      |  4 ++++
 device-raven.mk       |  4 ++++
 powerhint-oriole.json | 22 ----------------------
 powerhint-raven.json  | 28 ----------------------------
 5 files changed, 16 insertions(+), 50 deletions(-)

diff --git a/conf/init.raviole.rc b/conf/init.raviole.rc
index 31ff159..1437c49 100644
--- a/conf/init.raviole.rc
+++ b/conf/init.raviole.rc
@@ -66,3 +66,11 @@ on property:persist.vendor.se.ese2.mode=ctsmode
 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/device-oriole.mk b/device-oriole.mk
index d618bb8..e30c829 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -248,3 +248,7 @@ PRODUCT_PACKAGES += \
 # Device features
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml
+
+# Enable adpf cpu hint session for SurfaceFlinger
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
+    debug.sf.enable_adpf_cpu_hint=true
diff --git a/device-raven.mk b/device-raven.mk
index 1b92705..ca789ed 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -262,3 +262,7 @@ PRODUCT_PACKAGES += \
 # Device features
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml
+
+# Enable adpf cpu hint session for SurfaceFlinger
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
+    debug.sf.enable_adpf_cpu_hint=true
diff --git a/powerhint-oriole.json b/powerhint-oriole.json
index 6e340f8..3966249 100644
--- a/powerhint-oriole.json
+++ b/powerhint-oriole.json
@@ -148,16 +148,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",
diff --git a/powerhint-raven.json b/powerhint-raven.json
index 822729f..26b07ef 100644
--- a/powerhint-raven.json
+++ b/powerhint-raven.json
@@ -147,16 +147,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",
@@ -474,12 +464,6 @@
     }
   ],
   "Actions": [
-    {
-      "PowerHint": "INTERACTION",
-      "Node": "SFUClampBoost",
-      "Duration": 5000,
-      "Value": "85"
-    },
     {
       "PowerHint": "LAUNCH",
       "Node": "UClampThreshold",
@@ -492,12 +476,6 @@
       "Duration": 5000,
       "Value": "0"
     },
-    {
-      "PowerHint": "LAUNCH_120FPS",
-      "Node": "SFUClampBoost",
-      "Duration": 1000,
-      "Value": "161"
-    },
     {
       "PowerHint": "LAUNCH",
       "Node": "FGPreferIdle",
@@ -509,12 +487,6 @@
       "Type": "DoHint",
       "Value": "LAUNCH_120FPS"
     },
-    {
-      "PowerHint": "LAUNCH",
-      "Node": "SFUClampBoost",
-      "Duration": 5000,
-      "Value": "85"
-    },
     {
       "PowerHint": "LAUNCH",
       "Node": "CPUBigClusterMaxFreq",