From f70af577b407fe009dd69663434cb92ac4e65f31 Mon Sep 17 00:00:00 2001
From: Jia-yi Chen <jychen@google.com>
Date: Thu, 10 Aug 2023 11:30:10 -0700
Subject: [PATCH] Update CAMERA_SHOT hint

1) Set PMU_POLL to 0
2) Remove direct CPU freq settings but use UClamp

Bug: 295186805
Test: Run 3P snapshots and check logcat & perfetto trace
Change-Id: Ic8e8f6ab6439b378638a90e9d4238cd22db05e44
---
 perf/powerhint-husky.json      | 30 ++++++------------------------
 perf/powerhint-ripcurrent.json | 30 ++++++------------------------
 perf/powerhint-shiba.json      | 30 ++++++------------------------
 3 files changed, 18 insertions(+), 72 deletions(-)

diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json
index 265c778..20e50dc 100644
--- a/perf/powerhint-husky.json
+++ b/perf/powerhint-husky.json
@@ -1144,33 +1144,15 @@
     },
     {
       "PowerHint": "CAMERA_SHOT",
-      "Node": "MemFreq",
-      "Duration": 300,
-      "Value": "9999999"
+      "Node": "PMU_POLL",
+      "Duration": 100,
+      "Value": "0"
     },
     {
       "PowerHint": "CAMERA_SHOT",
-      "Node": "CPUBigClusterMaxFreq",
-      "Duration": 300,
-      "Value": "9999999"
-    },
-    {
-      "PowerHint": "CAMERA_SHOT",
-      "Node": "CPUBigClusterMinFreq",
-      "Duration": 300,
-      "Value": "9999999"
-    },
-    {
-      "PowerHint": "CAMERA_SHOT",
-      "Node": "CPUMidClusterMaxFreq",
-      "Duration": 300,
-      "Value": "9999999"
-    },
-    {
-      "PowerHint": "CAMERA_SHOT",
-      "Node": "CPUMidClusterMinFreq",
-      "Duration": 300,
-      "Value": "9999999"
+      "Node": "CAMUClampBoost",
+      "Duration": 100,
+      "Value": "765"
     },
     {
       "PowerHint": "CAMERA_BACKEND_BOOST",
diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json
index 4118b77..7340cc7 100644
--- a/perf/powerhint-ripcurrent.json
+++ b/perf/powerhint-ripcurrent.json
@@ -1081,33 +1081,15 @@
     },
     {
       "PowerHint": "CAMERA_SHOT",
-      "Node": "MemFreq",
-      "Duration": 300,
-      "Value": "9999999"
+      "Node": "PMU_POLL",
+      "Duration": 100,
+      "Value": "0"
     },
     {
       "PowerHint": "CAMERA_SHOT",
-      "Node": "CPUBigClusterMaxFreq",
-      "Duration": 300,
-      "Value": "9999999"
-    },
-    {
-      "PowerHint": "CAMERA_SHOT",
-      "Node": "CPUBigClusterMinFreq",
-      "Duration": 300,
-      "Value": "9999999"
-    },
-    {
-      "PowerHint": "CAMERA_SHOT",
-      "Node": "CPUMidClusterMaxFreq",
-      "Duration": 300,
-      "Value": "9999999"
-    },
-    {
-      "PowerHint": "CAMERA_SHOT",
-      "Node": "CPUMidClusterMinFreq",
-      "Duration": 300,
-      "Value": "9999999"
+      "Node": "CAMUClampBoost",
+      "Duration": 100,
+      "Value": "765"
     },
     {
       "PowerHint": "CAMERA_BACKEND_BOOST",
diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json
index 4fb526c..5d1bd1a 100644
--- a/perf/powerhint-shiba.json
+++ b/perf/powerhint-shiba.json
@@ -1144,33 +1144,15 @@
     },
     {
       "PowerHint": "CAMERA_SHOT",
-      "Node": "MemFreq",
-      "Duration": 300,
-      "Value": "9999999"
+      "Node": "PMU_POLL",
+      "Duration": 100,
+      "Value": "0"
     },
     {
       "PowerHint": "CAMERA_SHOT",
-      "Node": "CPUBigClusterMaxFreq",
-      "Duration": 300,
-      "Value": "9999999"
-    },
-    {
-      "PowerHint": "CAMERA_SHOT",
-      "Node": "CPUBigClusterMinFreq",
-      "Duration": 300,
-      "Value": "9999999"
-    },
-    {
-      "PowerHint": "CAMERA_SHOT",
-      "Node": "CPUMidClusterMaxFreq",
-      "Duration": 300,
-      "Value": "9999999"
-    },
-    {
-      "PowerHint": "CAMERA_SHOT",
-      "Node": "CPUMidClusterMinFreq",
-      "Duration": 300,
-      "Value": "9999999"
+      "Node": "CAMUClampBoost",
+      "Duration": 100,
+      "Value": "765"
     },
     {
       "PowerHint": "CAMERA_BACKEND_BOOST",