From 8cc3c2bf16ff54a2cc0fa8545841f616cae6f99a Mon Sep 17 00:00:00 2001
From: Pointer Kung <pointerkung@google.com>
Date: Wed, 8 May 2024 03:38:35 +0000
Subject: [PATCH 1/3] Enable PMU during photo capture

This CL enables PMU feature during photo capture. With the new settings, we can achieve up to 120ms saving in capture latency, while paying a penalty of 60mW. However, even with the added power, we are still below the F10 numbers (go/f10-camera-power-gtw).

Refer to ag/27238472

Bug: 340130143
Test: GCA photo capture
Change-Id: Ic1f4d5752a943a6898d92b0e44c78a85325be0a9
---
 powerhint-comet.json | 52 +++++++++++++++++++++++++++++---------------
 1 file changed, 34 insertions(+), 18 deletions(-)

diff --git a/powerhint-comet.json b/powerhint-comet.json
index e62ffb1..4ea0a78 100644
--- a/powerhint-comet.json
+++ b/powerhint-comet.json
@@ -593,10 +593,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
     },
     {
@@ -605,6 +606,7 @@
       "Values": [
         "76",
         "70",
+        "40",
         "55",
         "42",
         "35",
@@ -619,6 +621,7 @@
       "Path": "/sys/devices/system/cpu/cpufreq/policy4/sched_pixel/limit_frequency",
       "Values": [
         "1795000",
+        "1549000",
         "1328000"
       ],
       "DefaultIndex": 0,
@@ -631,6 +634,7 @@
         "59",
         "50",
         "32",
+        "15",
         "30",
         "20",
         "18"
@@ -653,8 +657,8 @@
       "Values": [
         "62",
         "50",
-        "22",
-        "20"
+        "20",
+        "22"
       ],
       "DefaultIndex": 0
     },
@@ -1429,27 +1433,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",

From 2d24dde4255186f6ce5e9df12a35a6003c31a763 Mon Sep 17 00:00:00 2001
From: vincenttew <vincenttew@google.com>
Date: Mon, 13 May 2024 18:07:47 +0800
Subject: [PATCH 2/3] audio: add sound dose offset curve

Bug: 340149054
Change-Id: I0d7181f0b8fa8f27f3fc6cd77152b228a0fd072d
Signed-off-by: vincenttew <vincenttew@google.com>
---
 audio/comet/aidl_config/audio_platform_configuration.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/audio/comet/aidl_config/audio_platform_configuration.xml b/audio/comet/aidl_config/audio_platform_configuration.xml
index 2a8bcff..e06157f 100644
--- a/audio/comet/aidl_config/audio_platform_configuration.xml
+++ b/audio/comet/aidl_config/audio_platform_configuration.xml
@@ -34,7 +34,9 @@
       <argument name="SpeakerPowerPollWaitMs" value="5000" />
     </feature>
     <feature name="RuntimeTuningDump" />
-    <feature name="SoundDose" />
+    <feature name="SoundDose">
+      <argument name="Curves" value="blackbird,condor=0,46.35,0.1950549451;54.6,57,0.98625" />
+    </feature>
     <feature name="MicrophoneCompensation" />
     <feature name="spatializer-offload" />
   </features>

From dbd19e783a56c4c57482559eb779ab722fc7bae0 Mon Sep 17 00:00:00 2001
From: Cyan_Hsieh <cyanhsieh@google.com>
Date: Tue, 14 May 2024 17:52:56 +0800
Subject: [PATCH 3/3] Move TARGET_LINUX_KERNEL_VERSION to device mk for comet

Bug: 340148508
Change-Id: Ie09a20ceceda948e00902cc6b3e2045bb200f5d1
---
 device-comet.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/device-comet.mk b/device-comet.mk
index e960d34..8bbd1e1 100644
--- a/device-comet.mk
+++ b/device-comet.mk
@@ -25,6 +25,7 @@ RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_
 $(call soong_config_set,comet_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_COMET_DIR))
 
 
+TARGET_LINUX_KERNEL_VERSION ?= 6.1
 ifdef RELEASE_GOOGLE_COMET_KERNEL_DIR
 TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_COMET_KERNEL_DIR)
 TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_COMET_KERNEL_DIR)/kernel-headers