From fb22d799d66663c05c5c85b746b563c74e58b721 Mon Sep 17 00:00:00 2001
From: "Ali K. Zadeh" <alikz@google.com>
Date: Thu, 11 Jul 2024 18:51:41 +0000
Subject: [PATCH] [caimito] Enable PA_KILL during PA_KILL_BOOST

Currently, we enable PA_KILL always on camera launch. This CL puts this
feature behind a power boost profile which can only be triggered from
camera hal and is controlled by a mendel flag.

Bug: 350594261
Test: adb logcat
Flag: EXEMPT resource only update
Change-Id: Id227bd35fda97d5b0cbdfe9e4df39eff2e565b7d
---
 perf/powerhint-caiman.json        | 19 +------------------
 perf/powerhint-komodo.json        | 19 +------------------
 perf/powerhint-ripcurrentpro.json | 19 +------------------
 perf/powerhint-tokay.json         | 19 +------------------
 4 files changed, 4 insertions(+), 72 deletions(-)

diff --git a/perf/powerhint-caiman.json b/perf/powerhint-caiman.json
index 52f47d8f..8d2bdd3c 100644
--- a/perf/powerhint-caiman.json
+++ b/perf/powerhint-caiman.json
@@ -579,16 +579,6 @@
       "Type": "Property",
       "ResetOnInit": true
     },
-    {
-      "Name": "PowerHALLaunch",
-      "Path": "vendor.powerhal.is_launch",
-      "Values": [
-        "1",
-        "0"
-      ],
-      "Type": "Property",
-      "ResetOnInit": true
-    },
     {
       "Name": "BigTjOffset",
       "Path": "/sys/devices/platform/100a0000.BIG/offset_enabled",
@@ -1130,12 +1120,6 @@
       "Duration": 5000,
       "Value": "1"
     },
-    {
-      "PowerHint": "LAUNCH",
-      "Node": "PowerHALLaunch",
-      "Duration": 5000,
-      "Value": "1"
-    },
     {
       "PowerHint": "LAUNCH_EXTEND",
       "Node": "CPUSkipMask",
@@ -1423,9 +1407,8 @@
       "Value": "0"
     },
     {
-      "PowerHint": "CAMERA_LAUNCH",
+      "PowerHint": "CAMERA_PA_KILL_BOOST",
       "Node": "PA_KILL",
-      "EnableProperty": "vendor.powerhal.is_launch",
       "Duration": 0,
       "Value": "102400"
     },
diff --git a/perf/powerhint-komodo.json b/perf/powerhint-komodo.json
index d9cd3f5a..26cc289e 100644
--- a/perf/powerhint-komodo.json
+++ b/perf/powerhint-komodo.json
@@ -579,16 +579,6 @@
       "Type": "Property",
       "ResetOnInit": true
     },
-    {
-      "Name": "PowerHALLaunch",
-      "Path": "vendor.powerhal.is_launch",
-      "Values": [
-        "1",
-        "0"
-      ],
-      "Type": "Property",
-      "ResetOnInit": true
-    },
     {
       "Name": "BigTjOffset",
       "Path": "/sys/devices/platform/100a0000.BIG/offset_enabled",
@@ -1130,12 +1120,6 @@
       "Duration": 5000,
       "Value": "1"
     },
-    {
-      "PowerHint": "LAUNCH",
-      "Node": "PowerHALLaunch",
-      "Duration": 5000,
-      "Value": "1"
-    },
     {
       "PowerHint": "LAUNCH_EXTEND",
       "Node": "CPUSkipMask",
@@ -1423,9 +1407,8 @@
       "Value": "0"
     },
     {
-      "PowerHint": "CAMERA_LAUNCH",
+      "PowerHint": "CAMERA_PA_KILL_BOOST",
       "Node": "PA_KILL",
-      "EnableProperty": "vendor.powerhal.is_launch",
       "Duration": 0,
       "Value": "102400"
     },
diff --git a/perf/powerhint-ripcurrentpro.json b/perf/powerhint-ripcurrentpro.json
index 9d8ceacf..cb48d792 100644
--- a/perf/powerhint-ripcurrentpro.json
+++ b/perf/powerhint-ripcurrentpro.json
@@ -569,16 +569,6 @@
       "Type": "Property",
       "ResetOnInit": true
     },
-    {
-      "Name": "PowerHALLaunch",
-      "Path": "vendor.powerhal.is_launch",
-      "Values": [
-        "1",
-        "0"
-      ],
-      "Type": "Property",
-      "ResetOnInit": true
-    },
     {
       "Name": "INTCAMFreq",
       "Path": "/sys/devices/platform/17000030.devfreq_intcam/devfreq/17000030.devfreq_intcam/min_freq",
@@ -1056,12 +1046,6 @@
       "Duration": 5000,
       "Value": "1"
     },
-    {
-      "PowerHint": "LAUNCH",
-      "Node": "PowerHALLaunch",
-      "Duration": 5000,
-      "Value": "1"
-    },
     {
       "PowerHint": "LAUNCH_EXTEND",
       "Node": "CPUSkipMask",
@@ -1343,9 +1327,8 @@
       "Value": "0"
     },
     {
-      "PowerHint": "CAMERA_LAUNCH",
+      "PowerHint": "CAMERA_PA_KILL_BOOST",
       "Node": "PA_KILL",
-      "EnableProperty": "vendor.powerhal.is_launch",
       "Duration": 0,
       "Value": "102400"
     },
diff --git a/perf/powerhint-tokay.json b/perf/powerhint-tokay.json
index 52f47d8f..8d2bdd3c 100644
--- a/perf/powerhint-tokay.json
+++ b/perf/powerhint-tokay.json
@@ -579,16 +579,6 @@
       "Type": "Property",
       "ResetOnInit": true
     },
-    {
-      "Name": "PowerHALLaunch",
-      "Path": "vendor.powerhal.is_launch",
-      "Values": [
-        "1",
-        "0"
-      ],
-      "Type": "Property",
-      "ResetOnInit": true
-    },
     {
       "Name": "BigTjOffset",
       "Path": "/sys/devices/platform/100a0000.BIG/offset_enabled",
@@ -1130,12 +1120,6 @@
       "Duration": 5000,
       "Value": "1"
     },
-    {
-      "PowerHint": "LAUNCH",
-      "Node": "PowerHALLaunch",
-      "Duration": 5000,
-      "Value": "1"
-    },
     {
       "PowerHint": "LAUNCH_EXTEND",
       "Node": "CPUSkipMask",
@@ -1423,9 +1407,8 @@
       "Value": "0"
     },
     {
-      "PowerHint": "CAMERA_LAUNCH",
+      "PowerHint": "CAMERA_PA_KILL_BOOST",
       "Node": "PA_KILL",
-      "EnableProperty": "vendor.powerhal.is_launch",
       "Duration": 0,
       "Value": "102400"
     },