From 730f445f0164fc85390a7ddefb3d753108eb2c40 Mon Sep 17 00:00:00 2001
From: "Ali K. Zadeh" <alikz@google.com>
Date: Mon, 6 May 2024 20:51:07 +0000
Subject: [PATCH] Enable PMU during photo capture

Bug: 298227152
Test: Kibble 12MP - https://docs.google.com/spreadsheets/d/1Exxzy_7CHu4RQQ_-eR2s16Ob9BpxdQZFn6GIkUmoc4k/edit?resourcekey=0-CrG5HCXn9v7iR0PFk84j2g#gid=328258859
Test: Kibble 50MP - https://docs.google.com/spreadsheets/d/1qIdxci3qRwgM_XD5rRdmQPqDrsf8VHQIqQggDh2rgGY/edit?resourcekey=0-t25YyqKalsLbrCM7ADDHlQ#gid=2134912777
Test: Kibble 12MP - repeated capture - https://docs.google.com/spreadsheets/d/1XTwC5iCaobxwCcj5QH1f_34lJysvFDv53wt4K9l8DAM/edit#gid=1477598242
Test: Kibble 50MP - repeated capture - https://docs.google.com/spreadsheets/d/17wlxE2MsRx56Vhr9IE1iBYLz1Lee1s7Bb7E_GKaBJtc/edit?resourcekey=0-Vh8vf55xZHgYnWqDESm5lA#gid=1630323952
Test: Latency 12MP - https://docs.google.com/spreadsheets/d/1xUmS4H8SmwKzrL-CScIhZABsrlCq1CZsDT9ZSWFAMwU/edit#gid=466916271
Test: Latency 50MP - https://docs.google.com/spreadsheets/d/1GUs1TVCCOD6Bv73ilxrjg99tJVq6wQ5kJfYrJ1djY54/edit#gid=1885938822
Change-Id: I5083184f9e226d42584de5b6910994f1d5d3cc52
---
 perf/powerhint-caiman.json        | 52 ++++++++++++++++++-----------
 perf/powerhint-komodo.json        | 52 ++++++++++++++++++-----------
 perf/powerhint-ripcurrentpro.json | 54 ++++++++++++++++++++-----------
 perf/powerhint-tokay.json         | 54 ++++++++++++++++++++-----------
 4 files changed, 138 insertions(+), 74 deletions(-)

diff --git a/perf/powerhint-caiman.json b/perf/powerhint-caiman.json
index bd9a7efe..d322bcff 100644
--- a/perf/powerhint-caiman.json
+++ b/perf/powerhint-caiman.json
@@ -594,10 +594,11 @@
       "Name": "PMU_LIT_LIMIT_FREQ",
       "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/limit_frequency",
       "Values": [
+        "1425000",
         "1328000",
         "1098000"
       ],
-      "DefaultIndex": 0,
+      "DefaultIndex": 1,
       "ResetOnInit": true
     },
     {
@@ -606,6 +607,7 @@
       "Values": [
         "76",
         "70",
+        "40",
         "55",
         "42",
         "35",
@@ -620,6 +622,7 @@
       "Path": "/sys/devices/system/cpu/cpufreq/policy4/sched_pixel/limit_frequency",
       "Values": [
         "1795000",
+        "1549000",
         "1328000"
       ],
       "DefaultIndex": 0,
@@ -632,6 +635,7 @@
         "59",
         "50",
         "32",
+        "15",
         "30",
         "20",
         "18"
@@ -654,8 +658,8 @@
       "Values": [
         "62",
         "50",
-        "22",
-        "20"
+        "20",
+        "22"
       ],
       "DefaultIndex": 0
     },
@@ -1412,27 +1416,39 @@
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
-      "Node": "CPUBigClusterMaxFreq",
-      "Duration": 3000,
-      "Value": "1885000"
-    },
-    {
-      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
-      "Node": "CPUMidClusterMaxFreq",
-      "Duration": 3000,
-      "Value": "1549000"
-    },
-    {
-      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
-      "Node": "CPULittleClusterMaxFreq",
+      "Node": "PMU_LIT_LIMIT_FREQ",
       "Duration": 3000,
       "Value": "1425000"
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
-      "Node": "PMU_POLL",
+      "Node": "PMU_MID_LIMIT_FREQ",
       "Duration": 3000,
-      "Value": "0"
+      "Value": "1549000"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "PMU_BIG_LIMIT_FREQ",
+      "Duration": 3000,
+      "Value": "1885000"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "PMU_LIT_SPC_THRESHOLD",
+      "Duration": 3000,
+      "Value": "40"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "PMU_MID_SPC_THRESHOLD",
+      "Duration": 3000,
+      "Value": "15"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "PMU_BIG_SPC_THRESHOLD",
+      "Duration": 3000,
+      "Value": "20"
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
diff --git a/perf/powerhint-komodo.json b/perf/powerhint-komodo.json
index a513e6eb..4af907ea 100644
--- a/perf/powerhint-komodo.json
+++ b/perf/powerhint-komodo.json
@@ -594,10 +594,11 @@
       "Name": "PMU_LIT_LIMIT_FREQ",
       "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/limit_frequency",
       "Values": [
+        "1425000",
         "1328000",
         "1098000"
       ],
-      "DefaultIndex": 0,
+      "DefaultIndex": 1,
       "ResetOnInit": true
     },
     {
@@ -606,6 +607,7 @@
       "Values": [
         "76",
         "70",
+        "40",
         "55",
         "42",
         "35",
@@ -620,6 +622,7 @@
       "Path": "/sys/devices/system/cpu/cpufreq/policy4/sched_pixel/limit_frequency",
       "Values": [
         "1795000",
+        "1549000",
         "1328000"
       ],
       "DefaultIndex": 0,
@@ -632,6 +635,7 @@
         "59",
         "50",
         "32",
+        "15",
         "30",
         "20",
         "18"
@@ -654,8 +658,8 @@
       "Values": [
         "62",
         "50",
-        "22",
-        "20"
+        "20",
+        "22"
       ],
       "DefaultIndex": 0
     },
@@ -1412,27 +1416,39 @@
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
-      "Node": "CPUBigClusterMaxFreq",
-      "Duration": 3000,
-      "Value": "1885000"
-    },
-    {
-      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
-      "Node": "CPUMidClusterMaxFreq",
-      "Duration": 3000,
-      "Value": "1549000"
-    },
-    {
-      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
-      "Node": "CPULittleClusterMaxFreq",
+      "Node": "PMU_LIT_LIMIT_FREQ",
       "Duration": 3000,
       "Value": "1425000"
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
-      "Node": "PMU_POLL",
+      "Node": "PMU_MID_LIMIT_FREQ",
       "Duration": 3000,
-      "Value": "0"
+      "Value": "1549000"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "PMU_BIG_LIMIT_FREQ",
+      "Duration": 3000,
+      "Value": "1885000"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "PMU_LIT_SPC_THRESHOLD",
+      "Duration": 3000,
+      "Value": "40"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "PMU_MID_SPC_THRESHOLD",
+      "Duration": 3000,
+      "Value": "15"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "PMU_BIG_SPC_THRESHOLD",
+      "Duration": 3000,
+      "Value": "20"
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
diff --git a/perf/powerhint-ripcurrentpro.json b/perf/powerhint-ripcurrentpro.json
index 4ed5a55f..4f6c5517 100644
--- a/perf/powerhint-ripcurrentpro.json
+++ b/perf/powerhint-ripcurrentpro.json
@@ -53,7 +53,7 @@
         "1800000",
         "1548000",
         "820000",
-        "610000",        
+        "610000",
         "0"
       ],
       "ResetOnInit": true
@@ -678,10 +678,11 @@
       "Name": "PMU_LIT_LIMIT_FREQ",
       "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/limit_frequency",
       "Values": [
+        "1425000",
         "1328000",
         "1098000"
       ],
-      "DefaultIndex": 0,
+      "DefaultIndex": 1,
       "ResetOnInit": true
     },
     {
@@ -690,6 +691,7 @@
       "Values": [
         "76",
         "70",
+        "40",
         "55",
         "42",
         "35",
@@ -704,6 +706,7 @@
       "Path": "/sys/devices/system/cpu/cpufreq/policy4/sched_pixel/limit_frequency",
       "Values": [
         "1795000",
+        "1549000",
         "1328000"
       ],
       "DefaultIndex": 0,
@@ -716,6 +719,7 @@
         "59",
         "50",
         "32",
+        "15",
         "30",
         "20",
         "18"
@@ -738,8 +742,8 @@
       "Values": [
         "62",
         "50",
-        "22",
-        "20"
+        "20",
+        "22"
       ],
       "DefaultIndex": 0
     },
@@ -1401,27 +1405,39 @@
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
-      "Node": "CPUBigClusterMaxFreq",
-      "Duration": 3000,
-      "Value": "1885000"
-    },
-    {
-      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
-      "Node": "CPUMidClusterMaxFreq",
-      "Duration": 3000,
-      "Value": "1549000"
-    },
-    {
-      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
-      "Node": "CPULittleClusterMaxFreq",
+      "Node": "PMU_LIT_LIMIT_FREQ",
       "Duration": 3000,
       "Value": "1425000"
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
-      "Node": "PMU_POLL",
+      "Node": "PMU_MID_LIMIT_FREQ",
       "Duration": 3000,
-      "Value": "0"
+      "Value": "1549000"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "PMU_BIG_LIMIT_FREQ",
+      "Duration": 3000,
+      "Value": "1885000"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "PMU_LIT_SPC_THRESHOLD",
+      "Duration": 3000,
+      "Value": "40"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "PMU_MID_SPC_THRESHOLD",
+      "Duration": 3000,
+      "Value": "15"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "PMU_BIG_SPC_THRESHOLD",
+      "Duration": 3000,
+      "Value": "20"
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
diff --git a/perf/powerhint-tokay.json b/perf/powerhint-tokay.json
index 02d1615d..d322bcff 100644
--- a/perf/powerhint-tokay.json
+++ b/perf/powerhint-tokay.json
@@ -594,10 +594,11 @@
       "Name": "PMU_LIT_LIMIT_FREQ",
       "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/limit_frequency",
       "Values": [
+        "1425000",
         "1328000",
         "1098000"
       ],
-      "DefaultIndex": 0,
+      "DefaultIndex": 1,
       "ResetOnInit": true
     },
     {
@@ -606,6 +607,7 @@
       "Values": [
         "76",
         "70",
+        "40",
         "55",
         "42",
         "35",
@@ -620,6 +622,7 @@
       "Path": "/sys/devices/system/cpu/cpufreq/policy4/sched_pixel/limit_frequency",
       "Values": [
         "1795000",
+        "1549000",
         "1328000"
       ],
       "DefaultIndex": 0,
@@ -632,6 +635,7 @@
         "59",
         "50",
         "32",
+        "15",
         "30",
         "20",
         "18"
@@ -654,8 +658,8 @@
       "Values": [
         "62",
         "50",
-        "22",
-        "20"
+        "20",
+        "22"
       ],
       "DefaultIndex": 0
     },
@@ -764,7 +768,7 @@
         "1800000",
         "1548000",
         "820000",
-        "610000",        
+        "610000",
         "0"
       ],
       "ResetOnInit": true
@@ -1412,27 +1416,39 @@
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
-      "Node": "CPUBigClusterMaxFreq",
-      "Duration": 3000,
-      "Value": "1885000"
-    },
-    {
-      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
-      "Node": "CPUMidClusterMaxFreq",
-      "Duration": 3000,
-      "Value": "1549000"
-    },
-    {
-      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
-      "Node": "CPULittleClusterMaxFreq",
+      "Node": "PMU_LIT_LIMIT_FREQ",
       "Duration": 3000,
       "Value": "1425000"
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
-      "Node": "PMU_POLL",
+      "Node": "PMU_MID_LIMIT_FREQ",
       "Duration": 3000,
-      "Value": "0"
+      "Value": "1549000"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "PMU_BIG_LIMIT_FREQ",
+      "Duration": 3000,
+      "Value": "1885000"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "PMU_LIT_SPC_THRESHOLD",
+      "Duration": 3000,
+      "Value": "40"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "PMU_MID_SPC_THRESHOLD",
+      "Duration": 3000,
+      "Value": "15"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "PMU_BIG_SPC_THRESHOLD",
+      "Duration": 3000,
+      "Value": "20"
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",