From 5156c03b75ebf868de788d18d11ed86d128894b0 Mon Sep 17 00:00:00 2001
From: "Ali K. Zadeh" <alikz@google.com>
Date: Mon, 7 Aug 2023 21:00:07 +0000
Subject: [PATCH] Set PMU_POLL to 0 instead of setting SPC threshold to 100 for
 CAMERA_ZOOMING_BOOST

Bug: 291979193
Test: Device boots okay with new powerhint file
Change-Id: I466873b118d12e1d72a237df72fa5d278ee2405d
(cherry picked from commit 0a99fb90e9cf0ab498239f378f2754d452dfe459)
---
 perf/powerhint-husky.json      | 19 ++-----------------
 perf/powerhint-ripcurrent.json | 19 ++-----------------
 perf/powerhint-shiba.json      | 19 ++-----------------
 3 files changed, 6 insertions(+), 51 deletions(-)

diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json
index 86438df..265c778 100644
--- a/perf/powerhint-husky.json
+++ b/perf/powerhint-husky.json
@@ -654,7 +654,6 @@
       "Name": "PMU_LIT_SPC_THRESHOLD",
       "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/spc_threshold",
       "Values": [
-        "100",
         "70",
         "42",
         "35",
@@ -686,7 +685,6 @@
       "Name": "PMU_MID_SPC_THRESHOLD",
       "Path": "/sys/devices/system/cpu/cpufreq/policy4/sched_pixel/spc_threshold",
       "Values": [
-        "100",
         "50",
         "30",
         "20",
@@ -716,7 +714,6 @@
       "Name": "PMU_BIG_SPC_THRESHOLD",
       "Path": "/sys/devices/system/cpu/cpufreq/policy8/sched_pixel/spc_threshold",
       "Values": [
-        "100",
         "50",
         "22",
         "20"
@@ -1207,21 +1204,9 @@
     },
     {
       "PowerHint": "CAMERA_ZOOMING_BOOST",
-      "Node": "PMU_LIT_SPC_THRESHOLD",
+      "Node": "PMU_POLL",
       "Duration": 100,
-      "Value": "100"
-    },
-    {
-      "PowerHint": "CAMERA_ZOOMING_BOOST",
-      "Node": "PMU_MID_SPC_THRESHOLD",
-      "Duration": 100,
-      "Value": "100"
-    },
-    {
-      "PowerHint": "CAMERA_ZOOMING_BOOST",
-      "Node": "PMU_BIG_SPC_THRESHOLD",
-      "Duration": 100,
-      "Value": "100"
+      "Value": "0"
     },
     {
       "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK1",
diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json
index f745ec0..4118b77 100644
--- a/perf/powerhint-ripcurrent.json
+++ b/perf/powerhint-ripcurrent.json
@@ -637,7 +637,6 @@
       "Name": "PMU_LIT_SPC_THRESHOLD",
       "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/spc_threshold",
       "Values": [
-        "100",
         "70",
         "42",
         "35",
@@ -669,7 +668,6 @@
       "Name": "PMU_MID_SPC_THRESHOLD",
       "Path": "/sys/devices/system/cpu/cpufreq/policy4/sched_pixel/spc_threshold",
       "Values": [
-        "100",
         "50",
         "30",
         "20",
@@ -699,7 +697,6 @@
       "Name": "PMU_BIG_SPC_THRESHOLD",
       "Path": "/sys/devices/system/cpu/cpufreq/policy8/sched_pixel/spc_threshold",
       "Values": [
-        "100",
         "50",
         "22",
         "20"
@@ -1144,21 +1141,9 @@
     },
     {
       "PowerHint": "CAMERA_ZOOMING_BOOST",
-      "Node": "PMU_LIT_SPC_THRESHOLD",
+      "Node": "PMU_POLL",
       "Duration": 100,
-      "Value": "100"
-    },
-    {
-      "PowerHint": "CAMERA_ZOOMING_BOOST",
-      "Node": "PMU_MID_SPC_THRESHOLD",
-      "Duration": 100,
-      "Value": "100"
-    },
-    {
-      "PowerHint": "CAMERA_ZOOMING_BOOST",
-      "Node": "PMU_BIG_SPC_THRESHOLD",
-      "Duration": 100,
-      "Value": "100"
+      "Value": "0"
     },
     {
       "PowerHint": "GCA_CAMERA_SHOT_BIGCPU",
diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json
index 3d56d8b..4fb526c 100644
--- a/perf/powerhint-shiba.json
+++ b/perf/powerhint-shiba.json
@@ -654,7 +654,6 @@
       "Name": "PMU_LIT_SPC_THRESHOLD",
       "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/spc_threshold",
       "Values": [
-        "100",
         "70",
         "42",
         "35",
@@ -686,7 +685,6 @@
       "Name": "PMU_MID_SPC_THRESHOLD",
       "Path": "/sys/devices/system/cpu/cpufreq/policy4/sched_pixel/spc_threshold",
       "Values": [
-        "100",
         "50",
         "30",
         "20",
@@ -716,7 +714,6 @@
       "Name": "PMU_BIG_SPC_THRESHOLD",
       "Path": "/sys/devices/system/cpu/cpufreq/policy8/sched_pixel/spc_threshold",
       "Values": [
-        "100",
         "50",
         "22",
         "20"
@@ -1207,21 +1204,9 @@
     },
     {
       "PowerHint": "CAMERA_ZOOMING_BOOST",
-      "Node": "PMU_LIT_SPC_THRESHOLD",
+      "Node": "PMU_POLL",
       "Duration": 100,
-      "Value": "100"
-    },
-    {
-      "PowerHint": "CAMERA_ZOOMING_BOOST",
-      "Node": "PMU_MID_SPC_THRESHOLD",
-      "Duration": 100,
-      "Value": "100"
-    },
-    {
-      "PowerHint": "CAMERA_ZOOMING_BOOST",
-      "Node": "PMU_BIG_SPC_THRESHOLD",
-      "Duration": 100,
-      "Value": "100"
+      "Value": "0"
     },
     {
       "PowerHint": "GCA_CAMERA_SHOT_BIGCPU",