From 4eb6a4ed65e2d2a5f80ac9c49503dc54cd9a2c68 Mon Sep 17 00:00:00 2001
From: Jasmine Cha <chajasmine@google.com>
Date: Fri, 6 May 2022 08:04:22 +0000
Subject: [PATCH 1/2] Revert "Revert "audio: enable thermal throttle""

This reverts commit e49bc9478a0bd1a91fdcc851b988a796458a841e.

Reason for revert: to be merged with  ag/18185769

Change-Id: I746f0b2fc5094653a373835d0c2d048bcca54ae5
---
 audio/cheetah/config/audio_platform_configuration.xml | 1 +
 audio/panther/config/audio_platform_configuration.xml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/audio/cheetah/config/audio_platform_configuration.xml b/audio/cheetah/config/audio_platform_configuration.xml
index e8faf44..12f7f83 100644
--- a/audio/cheetah/config/audio_platform_configuration.xml
+++ b/audio/cheetah/config/audio_platform_configuration.xml
@@ -232,6 +232,7 @@
     </dsp_latency>
 
     <soundcard_name name="google,aoc-snd-card" />
+    <features lists="ThermalThrottle=Type:SKIN,Name:VIRTUAL-SKIN" />
 
     <cfg_attr>
         <cfg id="OUT_SPEAKER_BE_CFG" intf_name="TDM_RX_0" mux="HW_MUX_GP_0" tuning_id="2"/>
diff --git a/audio/panther/config/audio_platform_configuration.xml b/audio/panther/config/audio_platform_configuration.xml
index e8faf44..12f7f83 100644
--- a/audio/panther/config/audio_platform_configuration.xml
+++ b/audio/panther/config/audio_platform_configuration.xml
@@ -232,6 +232,7 @@
     </dsp_latency>
 
     <soundcard_name name="google,aoc-snd-card" />
+    <features lists="ThermalThrottle=Type:SKIN,Name:VIRTUAL-SKIN" />
 
     <cfg_attr>
         <cfg id="OUT_SPEAKER_BE_CFG" intf_name="TDM_RX_0" mux="HW_MUX_GP_0" tuning_id="2"/>

From 87f9dffa440671c34ff04fd9d22e168d3e761a0d Mon Sep 17 00:00:00 2001
From: Wei Wang <wvw@google.com>
Date: Sat, 7 May 2022 18:11:07 -0700
Subject: [PATCH 2/2] Boost GPU to 572MHZ for Expensive Rendering

Bug: 230427792
Bug: 222716856
Test: Build
Signed-off-by: Wei Wang <wvw@google.com>
Change-Id: Ice6f569f1c93d03d706e099fe14420fb2da78f1b
---
 powerhint-cheetah-a0.json  | 4 ++--
 powerhint-cheetah.json     | 4 ++--
 powerhint-cloudripper.json | 4 ++--
 powerhint-panther-a0.json  | 4 ++--
 powerhint-panther.json     | 4 ++--
 powerhint-ravenclaw.json   | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/powerhint-cheetah-a0.json b/powerhint-cheetah-a0.json
index 8707576..fa25d1b 100644
--- a/powerhint-cheetah-a0.json
+++ b/powerhint-cheetah-a0.json
@@ -105,8 +105,8 @@
       "Values": [
         "848000",
         "762000",
+        "572000",
         "471000",
-        "400000",
         "302000",
         "151000"
       ],
@@ -1345,7 +1345,7 @@
       "PowerHint": "EXPENSIVE_RENDERING",
       "Node": "GPUMinFreq",
       "Duration": 0,
-      "Value": "400000"
+      "Value": "572000"
     },
     {
       "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT",
diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json
index 33debac..8ef5022 100644
--- a/powerhint-cheetah.json
+++ b/powerhint-cheetah.json
@@ -105,8 +105,8 @@
       "Values": [
         "848000",
         "762000",
+        "572000",
         "471000",
-        "400000",
         "302000",
         "151000"
       ],
@@ -1344,7 +1344,7 @@
       "PowerHint": "EXPENSIVE_RENDERING",
       "Node": "GPUMinFreq",
       "Duration": 0,
-      "Value": "400000"
+      "Value": "572000"
     },
     {
       "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT",
diff --git a/powerhint-cloudripper.json b/powerhint-cloudripper.json
index b7fc8bd..5623e5f 100644
--- a/powerhint-cloudripper.json
+++ b/powerhint-cloudripper.json
@@ -92,8 +92,8 @@
       "Values": [
         "848000",
         "762000",
+        "572000",
         "471000",
-        "400000",
         "302000",
         "151000"
       ],
@@ -1026,7 +1026,7 @@
       "PowerHint": "EXPENSIVE_RENDERING",
       "Node": "GPUMinFreq",
       "Duration": 0,
-      "Value": "400000"
+      "Value": "572000"
     },
     {
       "PowerHint": "FP_BOOST",
diff --git a/powerhint-panther-a0.json b/powerhint-panther-a0.json
index 617473b..51e6c8a 100644
--- a/powerhint-panther-a0.json
+++ b/powerhint-panther-a0.json
@@ -105,8 +105,8 @@
       "Values": [
         "848000",
         "762000",
+        "572000",
         "471000",
-        "400000",
         "302000",
         "151000"
       ],
@@ -1328,7 +1328,7 @@
       "PowerHint": "EXPENSIVE_RENDERING",
       "Node": "GPUMinFreq",
       "Duration": 0,
-      "Value": "400000"
+      "Value": "572000"
     },
     {
       "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT",
diff --git a/powerhint-panther.json b/powerhint-panther.json
index b3b9c25..ac8b999 100644
--- a/powerhint-panther.json
+++ b/powerhint-panther.json
@@ -105,8 +105,8 @@
       "Values": [
         "848000",
         "762000",
+        "572000",
         "471000",
-        "400000",
         "302000",
         "151000"
       ],
@@ -1327,7 +1327,7 @@
       "PowerHint": "EXPENSIVE_RENDERING",
       "Node": "GPUMinFreq",
       "Duration": 0,
-      "Value": "400000"
+      "Value": "572000"
     },
     {
       "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT",
diff --git a/powerhint-ravenclaw.json b/powerhint-ravenclaw.json
index 828a224..8505101 100644
--- a/powerhint-ravenclaw.json
+++ b/powerhint-ravenclaw.json
@@ -92,8 +92,8 @@
       "Values": [
         "848000",
         "762000",
+        "572000",
         "471000",
-        "400000",
         "302000",
         "151000"
       ],
@@ -1026,7 +1026,7 @@
       "PowerHint": "EXPENSIVE_RENDERING",
       "Node": "GPUMinFreq",
       "Duration": 0,
-      "Value": "400000"
+      "Value": "572000"
     },
     {
       "PowerHint": "FP_BOOST",