From 2b064d7831bc0926f9fed4157483243225f0bbc8 Mon Sep 17 00:00:00 2001
From: Wei Wang <wvw@google.com>
Date: Wed, 2 Feb 2022 23:15:58 -0800
Subject: [PATCH 1/3] Change restricted cpuset dynamically

Currently framework put tasks into restricted cpuset group when display
is off. However, when unlocking screen, SystemUI still runs in
restricted cpuset group leading to jank and delayed UDFPS action. This
CL mitigates problem by dynamically changing restricted cpuset group to
all cpus when display is back on.

Bug: 217481359
Test: Build
Signed-off-by: Wei Wang <wvw@google.com>
Change-Id: I1a7d49c69c02f97d70cbb4d2d716ec68cf0b8701
---
 powerhint.json | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/powerhint.json b/powerhint.json
index 07aa66d6..131af209 100644
--- a/powerhint.json
+++ b/powerhint.json
@@ -168,6 +168,15 @@
       ],
       "ResetOnInit": true
     },
+    {
+      "Name": "RestrictedCpuset",
+      "Path": "/dev/cpuset/restricted/cpus",
+      "Values": [
+        "0-3",
+        "0-7"
+      ],
+      "ResetOnInit": false
+    },
     {
       "Name": "CDHighCpusetCpus",
       "Path": "/dev/cpuset/camera-daemon-high-group/cpus",
@@ -1063,6 +1072,18 @@
       "Node": "CPUBigClusterMinFreq",
       "Duration": 1000,
       "Value": "9999999"
+    },
+    {
+      "PowerHint": "DEVICE_IDLE",
+      "Node": "RestrictedCpuset",
+      "Duration": 0,
+      "Value": "0-3"
+    },
+    {
+      "PowerHint": "DISPLAY_INACTIVE",
+      "Node": "RestrictedCpuset",
+      "Duration": 0,
+      "Value": "0-3"
     }
   ]
 }

From 200d13758a3c0e64a545755894cdf3ac4cd56dc3 Mon Sep 17 00:00:00 2001
From: Robin Hsu <robinhsu@google.com>
Date: Tue, 15 Feb 2022 16:38:40 +0800
Subject: [PATCH 2/3] config.xml: enable zram writeback

Bug: 207572250
Test: cmd jobscheduler run -f android 812
Signed-off-by: Robin Hsu <robinhsu@google.com>
Change-Id: If956c912325d820ad37c160d2d1d80d3e646a76c
---
 overlay/frameworks/base/core/res/res/values/config.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 2aeeb230..7ab9468a 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -278,6 +278,9 @@
           available on some devices. -->
     <bool name="config_enableHapticTextHandle">true</bool>
 
+    <!-- Enable Zram writeback feature to allow unused pages in zram be written to flash. -->
+    <bool name="config_zramWriteback">true</bool>
+
     <!-- Configure tcp buffer sizes in the form:
          rmem_min,rmem_def,rmem_max,wmem_min,wmem_def,wmem_max
          If this is configured as an empty string, the system default will be applied.

From ae8e17631be4504ba02b6346e2ed98544bf0bfa5 Mon Sep 17 00:00:00 2001
From: TeYuan Wang <kamewang@google.com>
Date: Wed, 16 Feb 2022 16:00:45 +0800
Subject: [PATCH 3/3] thermal: provide gxp-cooling user_vote permission for
 thermalHAL

Bug: 219869479
Test: ls -al dev/thermal/cdev-by-name/gxp-cooling/user_vote
Change-Id: Id11ad3cb6b1770cbaffb760feaad571c678a22df
---
 conf/init.gs201.rc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc
index a494a928..b1806db7 100644
--- a/conf/init.gs201.rc
+++ b/conf/init.gs201.rc
@@ -882,6 +882,7 @@ on property:vendor.thermal.link_ready=1
     chown system system /dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote
     chown system system /dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote
     chown system system /dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote
+    chown system system /dev/thermal/cdev-by-name/gxp-cooling/user_vote
     chown system system /dev/thermal/cdev-by-name/tpu_cooling/user_vote
     chown system system /dev/thermal/cdev-by-name/fcc/cur_state
     chown system system /dev/thermal/cdev-by-name/dc_icl/cur_state