From 77913a96ed6670ee44df46fab8d0a3fcb3791090 Mon Sep 17 00:00:00 2001
From: Jia-yi Chen <jychen@google.com>
Date: Tue, 26 Apr 2022 10:04:30 -0700
Subject: [PATCH 1/5] Update MIFTargetLoad default values

Bug: 223689835
Test: Boot and check values
Change-Id: Ia8f258432f289fa1cc74756cd7fc1b46bbd24806
---
 powerhint-cheetah-a0.json  | 4 ++--
 powerhint-cheetah.json     | 4 ++--
 powerhint-cloudripper.json | 4 ++--
 powerhint-panther-a0.json  | 4 ++--
 powerhint-panther.json     | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/powerhint-cheetah-a0.json b/powerhint-cheetah-a0.json
index 9b809df..09d4fcd 100644
--- a/powerhint-cheetah-a0.json
+++ b/powerhint-cheetah-a0.json
@@ -125,9 +125,9 @@
       "Name": "MIFTargetLoad",
       "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load",
       "Values": [
-        "20 5 80",
         "20 10 80",
-        "80 10 80"
+        "80 10 80",
+        "60 10 40"
       ],
       "ResetOnInit": true
     },
diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json
index 498083c..1d0cb50 100644
--- a/powerhint-cheetah.json
+++ b/powerhint-cheetah.json
@@ -125,9 +125,9 @@
       "Name": "MIFTargetLoad",
       "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load",
       "Values": [
-        "20 5 80",
         "20 10 80",
-        "80 10 80"
+        "80 10 80",
+        "60 10 40"
       ],
       "ResetOnInit": true
     },
diff --git a/powerhint-cloudripper.json b/powerhint-cloudripper.json
index 9235e7f..cf0157e 100644
--- a/powerhint-cloudripper.json
+++ b/powerhint-cloudripper.json
@@ -112,8 +112,8 @@
       "Name": "MIFTargetLoad",
       "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load",
       "Values": [
-        "20 5 80",
-        "20 10 80"
+        "20 10 80",
+        "60 10 40"
       ],
       "ResetOnInit": true
     },
diff --git a/powerhint-panther-a0.json b/powerhint-panther-a0.json
index 1f5af49..1c7a853 100644
--- a/powerhint-panther-a0.json
+++ b/powerhint-panther-a0.json
@@ -125,9 +125,9 @@
       "Name": "MIFTargetLoad",
       "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load",
       "Values": [
-        "20 5 80",
         "20 10 80",
-        "80 10 80"
+        "80 10 80",
+        "60 10 40"
       ],
       "ResetOnInit": true
     },
diff --git a/powerhint-panther.json b/powerhint-panther.json
index 3943d20..98da014 100644
--- a/powerhint-panther.json
+++ b/powerhint-panther.json
@@ -125,9 +125,9 @@
       "Name": "MIFTargetLoad",
       "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load",
       "Values": [
-        "20 5 80",
         "20 10 80",
-        "80 10 80"
+        "80 10 80",
+        "60 10 40"
       ],
       "ResetOnInit": true
     },

From 0424602e588eb748c7df03430feb885a419e1e60 Mon Sep 17 00:00:00 2001
From: Quang Luong <qal@google.com>
Date: Fri, 22 Apr 2022 11:51:26 -0700
Subject: [PATCH 2/5] Enable Wifi/LTE + GPS L1 Coex

Bug: 210920670
Test: build
Change-Id: I3ced2400b22f3e18c73df46a1b0a6788e9267cb8
---
 cheetah/rro_overlays/WifiOverlay/res/values/config.xml | 5 +++++
 panther/rro_overlays/WifiOverlay/res/values/config.xml | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/cheetah/rro_overlays/WifiOverlay/res/values/config.xml b/cheetah/rro_overlays/WifiOverlay/res/values/config.xml
index d900cef..168e45b 100644
--- a/cheetah/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/cheetah/rro_overlays/WifiOverlay/res/values/config.xml
@@ -130,6 +130,11 @@
     <!-- Enable the default coex channel avoidance algorithm and disable the functionality of
          WifiManager#setCoexUnsafeChannels. -->
     <bool translatable="false" name="config_wifiDefaultCoexAlgorithmEnabled">true</bool>
+    <!-- If the default coex channel avoidance algorithm is enabled, then avoid channels that
+         conflict with GPS L1. -->
+    <bool translatable="false" name="config_wifiCoexForGpsL1">true</bool>
+    <!-- The distance in KHz between Wi-Fi-based interference and GPS L1 that is considered unsafe. -->
+    <integer translatable="false" name="config_wifiCoexGpsL1ThresholdKhz">10000</integer>
 
     <!-- Whether to use the explicit vendor HAL API: IWifiStaIface.setRoamingState for disabling fw roaming. -->
     <bool translatable="false" name="config_wifiUseHalApiToDisableFwRoaming">true</bool>
diff --git a/panther/rro_overlays/WifiOverlay/res/values/config.xml b/panther/rro_overlays/WifiOverlay/res/values/config.xml
index d900cef..dd95725 100644
--- a/panther/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/panther/rro_overlays/WifiOverlay/res/values/config.xml
@@ -130,6 +130,12 @@
     <!-- Enable the default coex channel avoidance algorithm and disable the functionality of
          WifiManager#setCoexUnsafeChannels. -->
     <bool translatable="false" name="config_wifiDefaultCoexAlgorithmEnabled">true</bool>
+    <!-- If the default coex channel avoidance algorithm is enabled, then avoid channels that
+         conflict with GPS L1. -->
+    <bool translatable="false" name="config_wifiCoexForGpsL1">true</bool>
+    <!-- The distance in KHz between Wi-Fi-based interference and GPS L1 that is considered unsafe. -->
+    <integer translatable="false" name="config_wifiCoexGpsL1ThresholdKhz">10000</integer>
+
 
     <!-- Whether to use the explicit vendor HAL API: IWifiStaIface.setRoamingState for disabling fw roaming. -->
     <bool translatable="false" name="config_wifiUseHalApiToDisableFwRoaming">true</bool>

From 67c54d94ae6adb613ca58df7ce20ba59bd618a33 Mon Sep 17 00:00:00 2001
From: Sayanna Chandula <sayanna@google.com>
Date: Wed, 27 Apr 2022 22:02:33 +0000
Subject: [PATCH 3/5] thermal: fix cloudripper boot issue

Remove power rails from the thermal configuration for cloudripper.

Bug: 230031671
Test: Build and boot on device
Signed-off-by: Sayanna Chandula <sayanna@google.com>
Change-Id: Id37dbb99745c5cfbd7db9bcaf87241f39c5bf465
---
 thermal_info_config_cloudripper.json | 35 ----------------------------
 1 file changed, 35 deletions(-)

diff --git a/thermal_info_config_cloudripper.json b/thermal_info_config_cloudripper.json
index cf069aa..662ecfc 100644
--- a/thermal_info_config_cloudripper.json
+++ b/thermal_info_config_cloudripper.json
@@ -579,40 +579,5 @@
             "Type":"NPU",
             "WritePath":"/dev/thermal/cdev-by-name/tpu_cooling/user_vote"
         }
-    ],
-    "PowerRails":[
-        {
-            "Name":"PPVAR_VSYS_PWR_DISP"
-        },
-        {
-            "Name":"VSYS_PWR_MODEM"
-        },
-        {
-            "Name":"S2M_VDD_CPUCL2",
-            "PowerSampleDelay":14000,
-            "PowerSampleCount":5
-
-        },
-        {
-            "Name":"S3M_VDD_CPUCL1",
-            "PowerSampleDelay":14000,
-            "PowerSampleCount":5
-        },
-        {
-            "Name":"S4M_VDD_CPUCL0",
-            "PowerSampleDelay":14000,
-            "PowerSampleCount":5
-        },
-        {
-            "Name":"S5M_VDD_INT"
-        },
-        {
-            "Name":"S1M_VDD_MIF"
-        },
-        {
-            "Name":"S2S_VDD_G3D",
-            "PowerSampleDelay":14000,
-            "PowerSampleCount":5
-        }
     ]
 }

From 5df8c12d599f81997194539a18ddf007311d467c Mon Sep 17 00:00:00 2001
From: William Tai <williamtai@google.com>
Date: Thu, 7 Apr 2022 14:47:03 +0800
Subject: [PATCH 4/5] panther: add display high blocking zone

High blocking zone: > 50,000 Lux and UI normal brightness 100%. Lock 60Hz

Bug: 222637975
Test: manual test
Change-Id: Iabd0409c3989cf0000030d93f70c8715eca4174a
---
 .../frameworks/base/core/res/res/values/config.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/panther/overlay/frameworks/base/core/res/res/values/config.xml b/panther/overlay/frameworks/base/core/res/res/values/config.xml
index 5d62d5a..b8474ac 100644
--- a/panther/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/panther/overlay/frameworks/base/core/res/res/values/config.xml
@@ -81,6 +81,20 @@
     <!-- default refresh rate in the zone defined by birghtness and ambient thresholds -->
     <integer name="config_defaultRefreshRateInZone">90</integer>
 
+    <!-- Switch to fixed refresh rate when display brightness setting is
+         equal or more than this value -->
+    <integer-array name="config_highDisplayBrightnessThresholdsOfFixedRefreshRate">
+        <!-- System brightness for 500 nits: round((500-2)/(1000-2)*(255-1)+1) = 128 -->
+        <item>128</item> <!--100% UI normal brightness -->
+    </integer-array>
+
+    <integer-array name="config_highAmbientBrightnessThresholdsOfFixedRefreshRate">
+        <item>50000</item>
+    </integer-array>
+
+    <!-- default refresh rate in the high zone defined by birghtness and ambient thresholds -->
+    <integer name="config_fixedRefreshRateInHighZone">60</integer>
+
     <!-- Array of light sensor LUX values to define our levels for auto backlight brightness support.
       The N entries of this array define N  1 zones as follows:
          Zone 0:        0 <= LUX < array[0]

From d67d741f5f30ce0c928a7728cdc5e27c71d860df Mon Sep 17 00:00:00 2001
From: Sayanna Chandula <sayanna@google.com>
Date: Fri, 29 Apr 2022 00:16:41 +0000
Subject: [PATCH 5/5] thermal: remove power rails from ravenclaw config

New thermal engine uses ODPM data. Since ravenclaw might not have
proper ODPM data, it can result in boot failures.

Bug: 230031671
Test: Build and boot on device
Signed-off-by: Sayanna Chandula <sayanna@google.com>
Change-Id: Id6ca70f22c841aea7a622304e0c757c93e7f55e2
---
 thermal_info_config_ravenclaw.json | 35 ------------------------------
 1 file changed, 35 deletions(-)

diff --git a/thermal_info_config_ravenclaw.json b/thermal_info_config_ravenclaw.json
index 85d91b7..dff8af5 100644
--- a/thermal_info_config_ravenclaw.json
+++ b/thermal_info_config_ravenclaw.json
@@ -783,40 +783,5 @@
             "Type":"NPU",
             "WritePath":"/dev/thermal/cdev-by-name/tpu_cooling/user_vote"
         }
-    ],
-    "PowerRails":[
-        {
-            "Name":"PPVAR_VSYS_PWR_DISP"
-        },
-        {
-            "Name":"VSYS_PWR_MODEM"
-        },
-        {
-            "Name":"S2M_VDD_CPUCL2",
-            "PowerSampleDelay":14000,
-            "PowerSampleCount":5
-
-        },
-        {
-            "Name":"S3M_VDD_CPUCL1",
-            "PowerSampleDelay":14000,
-            "PowerSampleCount":5
-        },
-        {
-            "Name":"S4M_VDD_CPUCL0",
-            "PowerSampleDelay":14000,
-            "PowerSampleCount":5
-        },
-        {
-            "Name":"S5M_VDD_INT"
-        },
-        {
-            "Name":"S1M_VDD_MIF"
-        },
-        {
-            "Name":"S2S_VDD_G3D",
-            "PowerSampleDelay":14000,
-            "PowerSampleCount":5
-        }
     ]
 }