From ea5ddc4e5b7abd26e280f3100aacd8dbb22d2145 Mon Sep 17 00:00:00 2001
From: "Ali K. Zadeh" <alikz@google.com>
Date: Fri, 7 Jul 2023 22:19:03 +0000
Subject: [PATCH] CAMERA_CAPTURE_CPU_THROTTLE powerhint: Adjust CPU frequency
 caps, use cam1 EM

Bug: 288988849
Test: ODPM, capture latency, framedrops (https://docs.google.com/spreadsheets/d/1D8_gsLGdNEGOxoN6HA59EBORqTv7d9oM3LAQPe11BNE/edit?resourcekey=0-4m7SdJwoBlFm9FnmHAkXOA#gid=1867870464, https://buganizer.corp.google.com/issues/288988849#comment27)
Change-Id: If09afa009e172fa48cfa22de5b28395f2d0137f7
---
 perf/powerhint-husky.json      | 18 ++++++------------
 perf/powerhint-ripcurrent.json | 18 ++++++------------
 perf/powerhint-shiba.json      | 18 ++++++------------
 3 files changed, 18 insertions(+), 36 deletions(-)

diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json
index 4f4e5a0..a87b2bd 100644
--- a/perf/powerhint-husky.json
+++ b/perf/powerhint-husky.json
@@ -1092,33 +1092,27 @@
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
       "Node": "CPUBigClusterMaxFreq",
-      "Duration": 2500,
-      "Value": "1557000"
+      "Duration": 3000,
+      "Value": "1852000"
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
       "Node": "CPUMidClusterMaxFreq",
-      "Duration": 2500,
-      "Value": "1221000"
+      "Duration": 3000,
+      "Value": "1622000"
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
       "Node": "CPULittleClusterMaxFreq",
-      "Duration": 2500,
+      "Duration": 3000,
       "Value": "1475000"
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
       "Node": "PMU_POLL",
-      "Duration": 2500,
+      "Duration": 3000,
       "Value": "0"
     },
-    {
-      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
-      "Node": "EM_Profile",
-      "Duration": 2500,
-      "Value": "default"
-    },
     {
       "PowerHint": "CAMERA_SHOT",
       "Node": "MemFreq",
diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json
index 55edc6f..95dd631 100644
--- a/perf/powerhint-ripcurrent.json
+++ b/perf/powerhint-ripcurrent.json
@@ -1034,33 +1034,27 @@
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
       "Node": "CPUBigClusterMaxFreq",
-      "Duration": 2500,
-      "Value": "1557000"
+      "Duration": 3000,
+      "Value": "1852000"
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
       "Node": "CPUMidClusterMaxFreq",
-      "Duration": 2500,
-      "Value": "1221000"
+      "Duration": 3000,
+      "Value": "1622000"
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
       "Node": "CPULittleClusterMaxFreq",
-      "Duration": 2500,
+      "Duration": 3000,
       "Value": "1475000"
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
       "Node": "PMU_POLL",
-      "Duration": 2500,
+      "Duration": 3000,
       "Value": "0"
     },
-    {
-      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
-      "Node": "EM_Profile",
-      "Duration": 2500,
-      "Value": "default"
-    },
     {
       "PowerHint": "CAMERA_SHOT",
       "Node": "MemFreq",
diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json
index af62252..19a4be2 100644
--- a/perf/powerhint-shiba.json
+++ b/perf/powerhint-shiba.json
@@ -1092,33 +1092,27 @@
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
       "Node": "CPUBigClusterMaxFreq",
-      "Duration": 2500,
-      "Value": "1557000"
+      "Duration": 3000,
+      "Value": "1852000"
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
       "Node": "CPUMidClusterMaxFreq",
-      "Duration": 2500,
-      "Value": "1221000"
+      "Duration": 3000,
+      "Value": "1622000"
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
       "Node": "CPULittleClusterMaxFreq",
-      "Duration": 2500,
+      "Duration": 3000,
       "Value": "1475000"
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
       "Node": "PMU_POLL",
-      "Duration": 2500,
+      "Duration": 3000,
       "Value": "0"
     },
-    {
-      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
-      "Node": "EM_Profile",
-      "Duration": 2500,
-      "Value": "default"
-    },
     {
       "PowerHint": "CAMERA_SHOT",
       "Node": "MemFreq",