From 6a6ef32b4207ee23e3f6fe449a0a16a98b03c9d6 Mon Sep 17 00:00:00 2001
From: "Peter (YM)" <peterym@google.com>
Date: Wed, 16 Oct 2024 04:57:22 +0000
Subject: [PATCH] thermal: Override severity when CPU throttling

1. When CPU max frequency throttled to cdev ceiling of CPU-MID, will
   override the severity to SEVERE
2. Create VSKIN-DISPLAY to bind with display thermal throttle

Bug: 373750888
Test: Test with emul_temp
Flag: EXEMPT tuning changes
Signed-off-by: Peter (YM) <peterym@google.com>
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b309c4ef4375f39d07acd2ae499b368fb7fc9d9b)
Merged-In: I602c93ed5e825c1405a3f9f98cafe87e251a8038
Change-Id: I602c93ed5e825c1405a3f9f98cafe87e251a8038
---
 thermal/thermal_info_config_tegu.json | 31 +++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/thermal/thermal_info_config_tegu.json b/thermal/thermal_info_config_tegu.json
index 2bc230e..64cfb92 100644
--- a/thermal/thermal_info_config_tegu.json
+++ b/thermal/thermal_info_config_tegu.json
@@ -300,6 +300,17 @@
             "StepRatio": 0.4,
             "PassiveDelay": 7000
         },
+        {
+            "Name": "CPU_THROTTLE_SEVERE",
+            "Type": "UNKNOWN",
+            "VirtualSensor": true,
+            "Formula": "COUNT_THRESHOLD",
+            "Combination": ["thermal-cpufreq-0", "thermal-cpufreq-1", "thermal-cpufreq-2"],
+            "CombinationType": ["CDEV", "CDEV", "CDEV"],
+            "Coefficient": [7.0, 10.0, 17.0],
+            "HotThreshold": ["NAN", "NaN", "NaN", "3", "NaN", "NaN", "NaN"],
+            "HotHysteresis": [0.0, 0.0, 0.0, 1.9, 0.0, 0.0, 0.0]
+        },
         {
             "Name":"VIRTUAL-SKIN",
             "Type":"SKIN",
@@ -314,6 +325,7 @@
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
             "Multiplier":0.001,
             "SendCallback":true,
+            "SeverityReference": "CPU_THROTTLE_SEVERE",
             "PollingDelay":300000,
             "PassiveDelay":7000,
             "BindedCdevInfo": [
@@ -983,6 +995,21 @@
             "PollingDelay":300000,
             "PassiveDelay":7000
         },
+        {
+            "Name": "VIRTUAL-SKIN-DISPLAY",
+            "Type": "DISPLAY",
+            "VirtualSensor": true,
+            "TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Formula": "MAXIMUM",
+            "Combination": ["VIRTUAL-SKIN"],
+            "Coefficient": [1.0],
+            "HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0],
+            "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
+            "Multiplier": 0.001,
+            "SendCallback": true,
+            "PollingDelay": 300000,
+            "PassiveDelay": 7000
+        },
         {
             "Name":"VSKIN-SKIN-UNDER-52",
             "Type":"UNKNOWN",
@@ -1407,6 +1434,10 @@
                     "Name": "EXTREME-SOC-CONDITION-CHECK",
                     "Thresholds": [0, 3]
                 },
+                {
+                    "Name": "CPU_THROTTLE_SEVERE",
+                    "Thresholds": [0, 3]
+                },
                 {
                     "Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF",
                     "LoggingName": "MODEL-LEGACY-0.5",