From d3a89c38934904fe564ceb02eddc563c81e1545e Mon Sep 17 00:00:00 2001
From: David Li <dvdli@google.com>
Date: Tue, 6 Jun 2023 10:10:09 +0000
Subject: [PATCH 1/3] audio: enable offloaded DPE

Bug: 278812541
Test: Adaptive sound and Juno app
Change-Id: I98890f0aded57fb1724472b52e97a47e9168ffd6
---
 audio/husky/config/audio_effects.xml | 7 +++++--
 audio/shiba/config/audio_effects.xml | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/audio/husky/config/audio_effects.xml b/audio/husky/config/audio_effects.xml
index e35bfbd..11e66e5 100644
--- a/audio/husky/config/audio_effects.xml
+++ b/audio/husky/config/audio_effects.xml
@@ -5,7 +5,7 @@
         <library name="reverb" path="libreverbwrapper.so"/>
         <library name="visualizer_sw" path="libvisualizer.so"/>
         <library name="downmix" path="libdownmix.so"/>
-        <library name="dynamics_processing" path="libdynproc.so"/>
+        <library name="dynamics_processing_sw" path="libdynproc.so"/>
         <library name="loudness_enhancer" path="libldnhncr.so"/>
         <library name="proxy" path="libeffectproxy.so"/>
         <library name="offload_effect" path="liboffloadeffect.so"/>
@@ -46,12 +46,15 @@
             <libsw library="visualizer_sw" uuid="d069d9e0-8329-11df-9168-0002a5d5c51b"/>
             <libhw library="offload_effect" uuid="99fb2ecb-3426-4a0e-8082-1a1da5604b7d"/>
         </effectProxy>
+        <effectProxy name="dynamics_processing" library="proxy" uuid="dcf01474-8982-11ec-a8a3-0242ac120002">
+            <libsw library="dynamics_processing_sw" uuid="e0e6539b-1781-7261-676f-6d7573696340"/>
+            <libhw library="offload_effect" uuid="1bf15eb7-8f49-4fd8-8380-0767fd5680f3"/>
+        </effectProxy>
         <effect name="downmix" library="downmix" uuid="93f04452-e4fe-41cc-91f9-e475b6d1d69f"/>
         <effect name="loudness_enhancer" library="loudness_enhancer" uuid="fa415329-2034-4bea-b5dc-5b381c8d1e2c"/>
         <effect name="aec" library="offload_effect" uuid="28c28780-ec8b-48b6-8590-8c84557d797d"/>
         <effect name="ns" library="offload_effect" uuid="62ff2836-d050-43c3-9c2d-94a73dad2c64"/>
         <effect name="haptic_generator" library="haptic_generator" uuid="97c4acd1-8b82-4f2f-832e-c2fe5d7a9931"/>
-        <effect name="dynamics_processing" library="dynamics_processing" uuid="e0e6539b-1781-7261-676f-6d7573696340"/>
         <effect name="spatializer" library="spatializer" uuid="cc4677de-ff72-11eb-9a03-0242ac130003"/>
     </effects>
     <postprocess>
diff --git a/audio/shiba/config/audio_effects.xml b/audio/shiba/config/audio_effects.xml
index e35bfbd..11e66e5 100644
--- a/audio/shiba/config/audio_effects.xml
+++ b/audio/shiba/config/audio_effects.xml
@@ -5,7 +5,7 @@
         <library name="reverb" path="libreverbwrapper.so"/>
         <library name="visualizer_sw" path="libvisualizer.so"/>
         <library name="downmix" path="libdownmix.so"/>
-        <library name="dynamics_processing" path="libdynproc.so"/>
+        <library name="dynamics_processing_sw" path="libdynproc.so"/>
         <library name="loudness_enhancer" path="libldnhncr.so"/>
         <library name="proxy" path="libeffectproxy.so"/>
         <library name="offload_effect" path="liboffloadeffect.so"/>
@@ -46,12 +46,15 @@
             <libsw library="visualizer_sw" uuid="d069d9e0-8329-11df-9168-0002a5d5c51b"/>
             <libhw library="offload_effect" uuid="99fb2ecb-3426-4a0e-8082-1a1da5604b7d"/>
         </effectProxy>
+        <effectProxy name="dynamics_processing" library="proxy" uuid="dcf01474-8982-11ec-a8a3-0242ac120002">
+            <libsw library="dynamics_processing_sw" uuid="e0e6539b-1781-7261-676f-6d7573696340"/>
+            <libhw library="offload_effect" uuid="1bf15eb7-8f49-4fd8-8380-0767fd5680f3"/>
+        </effectProxy>
         <effect name="downmix" library="downmix" uuid="93f04452-e4fe-41cc-91f9-e475b6d1d69f"/>
         <effect name="loudness_enhancer" library="loudness_enhancer" uuid="fa415329-2034-4bea-b5dc-5b381c8d1e2c"/>
         <effect name="aec" library="offload_effect" uuid="28c28780-ec8b-48b6-8590-8c84557d797d"/>
         <effect name="ns" library="offload_effect" uuid="62ff2836-d050-43c3-9c2d-94a73dad2c64"/>
         <effect name="haptic_generator" library="haptic_generator" uuid="97c4acd1-8b82-4f2f-832e-c2fe5d7a9931"/>
-        <effect name="dynamics_processing" library="dynamics_processing" uuid="e0e6539b-1781-7261-676f-6d7573696340"/>
         <effect name="spatializer" library="spatializer" uuid="cc4677de-ff72-11eb-9a03-0242ac130003"/>
     </effects>
     <postprocess>

From aaab542d553ec091ca05e607df2e5fbad9a17b88 Mon Sep 17 00:00:00 2001
From: Taeju Park <taeju@google.com>
Date: Wed, 5 Apr 2023 01:15:32 +0000
Subject: [PATCH 2/3] powerhint: Port powerhints for LAUNCH from Pantah

Bug: 258095095
Change-Id: I481b807f87f61f115d5b6d43a42410fbbe3c2d1e
Signed-off-by: Taeju Park <taeju@google.com>
---
 perf/powerhint-husky.json      | 43 ++++++++++++++++++++++++++++++++++
 perf/powerhint-ripcurrent.json | 43 ++++++++++++++++++++++++++++++++++
 perf/powerhint-shiba.json      | 43 ++++++++++++++++++++++++++++++++++
 3 files changed, 129 insertions(+)

diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json
index ec28ddb..eeefaf4 100644
--- a/perf/powerhint-husky.json
+++ b/perf/powerhint-husky.json
@@ -191,6 +191,15 @@
       "DefaultIndex": 0,
       "ResetOnInit": true
     },
+    {
+      "Name": "GPUDvfsPeriod",
+      "Path": "/sys/devices/platform/1f000000.mali/dvfs_period",
+      "Values": [
+        "10",
+        "20"
+      ],
+      "ResetOnInit": true
+    },
     {
       "Name": "ReducePreferIdle",
       "Path": "/proc/vendor_sched/reduce_prefer_idle",
@@ -747,12 +756,23 @@
       "Duration": 5000,
       "Value": "0"
     },
+    {
+      "PowerHint": "LAUNCH_GPU",
+      "Node": "GPUDvfsPeriod",
+      "Duration": 1000,
+      "Value": "10"
+    },
     {
       "PowerHint": "LAUNCH",
       "Node": "FGPreferIdle",
       "Duration": 5000,
       "Value": "1"
     },
+    {
+      "PowerHint": "LAUNCH",
+      "Type": "DoHint",
+      "Value": "LAUNCH_GPU"
+    },
     {
       "PowerHint": "LAUNCH",
       "Node": "CPUBigClusterMaxFreq",
@@ -836,6 +856,29 @@
       "EnableProperty": "vendor.powerhal.camerarunning",
       "Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED"
     },
+    {
+      "PowerHint": "LAUNCH",
+      "Type": "DoHint",
+      "Value": "LAUNCH_EXTEND"
+    },
+    {
+      "PowerHint": "LAUNCH_EXTEND",
+      "Node": "CPUBigClusterMaxFreq",
+      "Duration": 2000,
+      "Value": "9999999"
+    },
+    {
+      "PowerHint": "LAUNCH_EXTEND",
+      "Node": "CPUMidClusterMaxFreq",
+      "Duration": 2000,
+      "Value": "9999999"
+    },
+    {
+      "PowerHint": "LAUNCH_EXTEND",
+      "Node": "CPULittleClusterMaxFreq",
+      "Duration": 2000,
+      "Value": "9999999"
+    },
     {
       "PowerHint": "LAUNCH_PMU",
       "Node": "PMU_POLL",
diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json
index b99fba9..1fda46a 100644
--- a/perf/powerhint-ripcurrent.json
+++ b/perf/powerhint-ripcurrent.json
@@ -175,6 +175,15 @@
       ],
       "ResetOnInit": true
     },
+    {
+      "Name": "GPUDvfsPeriod",
+      "Path": "/sys/devices/platform/1f000000.mali/dvfs_period",
+      "Values": [
+        "10",
+        "20"
+      ],
+      "ResetOnInit": true
+    },
     {
       "Name": "ReducePreferIdle",
       "Path": "/proc/vendor_sched/reduce_prefer_idle",
@@ -731,12 +740,23 @@
       "Duration": 5000,
       "Value": "0"
     },
+    {
+      "PowerHint": "LAUNCH_GPU",
+      "Node": "GPUDvfsPeriod",
+      "Duration": 1000,
+      "Value": "10"
+    },
     {
       "PowerHint": "LAUNCH",
       "Node": "FGPreferIdle",
       "Duration": 5000,
       "Value": "1"
     },
+    {
+      "PowerHint": "LAUNCH",
+      "Type": "DoHint",
+      "Value": "LAUNCH_GPU"
+    },
     {
       "PowerHint": "LAUNCH",
       "Node": "CPUBigClusterMaxFreq",
@@ -820,6 +840,29 @@
       "EnableProperty": "vendor.powerhal.camerarunning",
       "Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED"
     },
+    {
+      "PowerHint": "LAUNCH",
+      "Type": "DoHint",
+      "Value": "LAUNCH_EXTEND"
+    },
+    {
+      "PowerHint": "LAUNCH_EXTEND",
+      "Node": "CPUBigClusterMaxFreq",
+      "Duration": 2000,
+      "Value": "9999999"
+    },
+    {
+      "PowerHint": "LAUNCH_EXTEND",
+      "Node": "CPUMidClusterMaxFreq",
+      "Duration": 2000,
+      "Value": "9999999"
+    },
+    {
+      "PowerHint": "LAUNCH_EXTEND",
+      "Node": "CPULittleClusterMaxFreq",
+      "Duration": 2000,
+      "Value": "9999999"
+    },
     {
       "PowerHint": "LAUNCH_PMU",
       "Node": "PMU_POLL",
diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json
index b05e21e..da37235 100644
--- a/perf/powerhint-shiba.json
+++ b/perf/powerhint-shiba.json
@@ -181,6 +181,15 @@
       "DefaultIndex": 0,
       "ResetOnInit": true
     },
+    {
+      "Name": "GPUDvfsPeriod",
+      "Path": "/sys/devices/platform/1f000000.mali/dvfs_period",
+      "Values": [
+        "10",
+        "20"
+      ],
+      "ResetOnInit": true
+    },
     {
       "Name": "ReducePreferIdle",
       "Path": "/proc/vendor_sched/reduce_prefer_idle",
@@ -747,12 +756,23 @@
       "Duration": 5000,
       "Value": "0"
     },
+    {
+      "PowerHint": "LAUNCH_GPU",
+      "Node": "GPUDvfsPeriod",
+      "Duration": 1000,
+      "Value": "10"
+    },
     {
       "PowerHint": "LAUNCH",
       "Node": "FGPreferIdle",
       "Duration": 5000,
       "Value": "1"
     },
+    {
+      "PowerHint": "LAUNCH",
+      "Type": "DoHint",
+      "Value": "LAUNCH_GPU"
+    },
     {
       "PowerHint": "LAUNCH",
       "Node": "CPUBigClusterMaxFreq",
@@ -836,6 +856,29 @@
       "EnableProperty": "vendor.powerhal.camerarunning",
       "Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED"
     },
+    {
+      "PowerHint": "LAUNCH",
+      "Type": "DoHint",
+      "Value": "LAUNCH_EXTEND"
+    },
+    {
+      "PowerHint": "LAUNCH_EXTEND",
+      "Node": "CPUBigClusterMaxFreq",
+      "Duration": 2000,
+      "Value": "9999999"
+    },
+    {
+      "PowerHint": "LAUNCH_EXTEND",
+      "Node": "CPUMidClusterMaxFreq",
+      "Duration": 2000,
+      "Value": "9999999"
+    },
+    {
+      "PowerHint": "LAUNCH_EXTEND",
+      "Node": "CPULittleClusterMaxFreq",
+      "Duration": 2000,
+      "Value": "9999999"
+    },
     {
       "PowerHint": "LAUNCH_PMU",
       "Node": "PMU_POLL",

From f0fef6e0cb9e48e33553ce5069faebd1d1580743 Mon Sep 17 00:00:00 2001
From: Cheng Chang <chengcha@google.com>
Date: Tue, 6 Jun 2023 03:56:57 +0000
Subject: [PATCH 3/3] gps: update gps configuration

 - enable always-on measurements log
 - disable memory leak debug function

Bug: 285997970
Test: bugbot tests log mask at b/285997970
Change-Id: Ie856bf366df50d7c337b138796e9bedb370dac8a
---
 location/gps.xml     | 3 +--
 location/gps.xml.hk3 | 3 +--
 location/gps.xml.sb3 | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/location/gps.xml b/location/gps.xml
index 110ffe0..013d2a0 100644
--- a/location/gps.xml
+++ b/location/gps.xml
@@ -61,12 +61,11 @@
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
-       MallocDebugAssertThreshold="104857600"
   />
 
   <gll
        LogPriMask="LOG_INFO"
-       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
+       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI | LOG_MEASAPI"
        FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
        MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
        MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
diff --git a/location/gps.xml.hk3 b/location/gps.xml.hk3
index a111c9c..1640d87 100644
--- a/location/gps.xml.hk3
+++ b/location/gps.xml.hk3
@@ -61,12 +61,11 @@
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
-       MallocDebugAssertThreshold="104857600"
   />
 
   <gll
        LogPriMask="LOG_INFO"
-       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
+       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI | LOG_MEASAPI"
        FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
        MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
        MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
diff --git a/location/gps.xml.sb3 b/location/gps.xml.sb3
index 69bba8a..015e0d8 100644
--- a/location/gps.xml.sb3
+++ b/location/gps.xml.sb3
@@ -61,12 +61,11 @@
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
-       MallocDebugAssertThreshold="104857600"
   />
 
   <gll
        LogPriMask="LOG_INFO"
-       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
+       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI | LOG_MEASAPI"
        FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
        MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
        MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"