From f8ee9754656b8e8d193207e29c7c6c99b9e4a89c Mon Sep 17 00:00:00 2001
From: David Chao <davidchao@google.com>
Date: Tue, 4 Oct 2022 17:28:03 +0800
Subject: [PATCH 1/3] thermal: more aggressive CPU/GPU thermal throttling
 policy

- Spower change from 1100 to 800

Bug: 248392264
Test: boot to home and thermal throttling worked properly
Change-Id: I760072cdec8523deb6075280912b0c264db2e36a
---
 thermal_info_config_lynx.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/thermal_info_config_lynx.json b/thermal_info_config_lynx.json
index 52020f0..0aaf0d8 100644
--- a/thermal_info_config_lynx.json
+++ b/thermal_info_config_lynx.json
@@ -153,12 +153,12 @@
             "PollingDelay":300000,
             "PassiveDelay":7000,
             "PIDInfo": {
-                "K_Po":["NAN", "NAN", 400, 500, "NAN", "NAN", "NAN"],
-                "K_Pu":["NAN", "NAN", 400, 500, "NAN", "NAN", "NAN"],
+                "K_Po":["NAN", "NAN", 600, 500, "NAN", "NAN", "NAN"],
+                "K_Pu":["NAN", "NAN", 600, 500, "NAN", "NAN", "NAN"],
                 "K_I":["NAN", "NAN", 0, 5, "NAN", "NAN", "NAN"],
                 "K_D":["NAN", "NAN", 0, 0, "NAN", "NAN", "NAN"],
                 "I_Max":["NAN", "NAN", 0, 300, "NAN", "NAN", "NAN"],
-                "S_Power":["NAN", "NAN", 2000, 1100, "NAN", "NAN", "NAN"],
+                "S_Power":["NAN", "NAN", 2000, 800, "NAN", "NAN", "NAN"],
                 "MinAllocPower":["NAN", "NAN", 1200, 800, "NAN", "NAN", "NAN"],
                 "MaxAllocPower":["NAN", "NAN", 10000, 10000, "NAN", "NAN", "NAN"],
                 "I_Cutoff":["NAN", "NAN", 0, 2, "NAN", "NAN", "NAN"],

From 96603477458b2cf7fa8c0da7526471f63766ecae Mon Sep 17 00:00:00 2001
From: David Chao <davidchao@google.com>
Date: Tue, 4 Oct 2022 17:28:53 +0800
Subject: [PATCH 2/3] thermal: modify GPU thermal throttling policy

- Change GPU CdevCeiling because GPU available_frequencies has been
  increased 2 states from 10 to 12.

Bug: 250502714
Test: boot to home and thermal throttling worked properly
Change-Id: I65751bd91c2767389732e5ca0160afb8b3ef42ad
---
 thermal_info_config_lynx.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/thermal_info_config_lynx.json b/thermal_info_config_lynx.json
index 0aaf0d8..cb48e5a 100644
--- a/thermal_info_config_lynx.json
+++ b/thermal_info_config_lynx.json
@@ -198,8 +198,8 @@
                     "MaxReleaseStep": 1,
                     "MaxThrottleStep": 1,
                     "BindedPowerRail": "S2S_VDD_G3D",
-                    "CdevCeiling": [0, 8, 8, 8, 8, 11, 11],
-                    "LimitInfo": [0, 0, 0, 0, 8, 11, 11]
+                    "CdevCeiling": [0, 10, 10, 10, 10, 12, 12],
+                    "LimitInfo": [0, 0, 0, 0, 10, 12, 12]
                 }
             ]
         },
@@ -458,7 +458,7 @@
             "BindedCdevInfo": [
                 {
                     "CdevRequest": "thermal-gpufreq-0",
-                    "LimitInfo": [0, 0, 0, 0, 9, 9, 9]
+                    "LimitInfo": [0, 0, 0, 0, 11, 11, 11]
                 }
             ]
         },
@@ -477,7 +477,7 @@
             "BindedCdevInfo": [
                 {
                     "CdevRequest": "thermal-gpufreq-0",
-                    "LimitInfo": [0, 0, 0, 0, 9, 9, 9]
+                    "LimitInfo": [0, 0, 0, 0, 11, 11, 11]
                 }
             ]
         },
@@ -515,7 +515,7 @@
             "BindedCdevInfo": [
                 {
                     "CdevRequest": "thermal-gpufreq-0",
-                    "LimitInfo": [0, 0, 0, 0, 4, 4, 4]
+                    "LimitInfo": [0, 0, 0, 0, 5, 5, 5]
                 }
             ]
         },
@@ -554,7 +554,7 @@
                 },
                 {
                     "CdevRequest": "thermal-gpufreq-0",
-                    "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
+                    "LimitInfo": [0, 0, 0, 0, 4, 4, 4]
                 },
                 {
                     "CdevRequest": "tpu_cooling",
@@ -608,7 +608,7 @@
                 },
                 {
                     "CdevRequest": "thermal-gpufreq-0",
-                    "LimitInfo": [0, 0, 0, 0, 4, 4, 4]
+                    "LimitInfo": [0, 0, 0, 0, 5, 5, 5]
                 },
                 {
                     "CdevRequest": "tpu_cooling",
@@ -629,7 +629,7 @@
                 },
                 {
                     "CdevRequest": "thermal-gpufreq-0",
-                    "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
+                    "LimitInfo": [0, 0, 0, 0, 4, 4, 4]
                 },
                 {
                     "CdevRequest": "tpu_cooling",

From 3d90324dfd9e5b1f128498f2a98c0012351861a1 Mon Sep 17 00:00:00 2001
From: Ching-Sung Li <chriscsli@google.com>
Date: Mon, 26 Sep 2022 12:20:32 +0800
Subject: [PATCH 3/3] Build L10 default CMF color wallpaper

Bug: 239505528
Test: Build pass; manual
Change-Id: I698d54e6fec71c09c726c4f72917db247448c64d
---
 device-lynx.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/device-lynx.mk b/device-lynx.mk
index be796f7..a510697 100644
--- a/device-lynx.mk
+++ b/device-lynx.mk
@@ -22,6 +22,7 @@ $(call inherit-product-if-exists, vendor/google_devices/gs201/prebuilts/device-v
 $(call inherit-product-if-exists, vendor/google_devices/gs201/proprietary/device-vendor.mk)
 $(call inherit-product-if-exists, vendor/google_devices/lynx/proprietary/lynx/device-vendor-lynx.mk)
 $(call inherit-product-if-exists, vendor/google_devices/lynx/proprietary/device-vendor.mk)
+$(call inherit-product-if-exists, vendor/google_devices/lynx/proprietary/WallpapersLynx.mk)
 
 DEVICE_PACKAGE_OVERLAYS += device/google/lynx/lynx/overlay