From 54fdaf379433d8ff2d5ba79eae31f26ac3779758 Mon Sep 17 00:00:00 2001 From: Ramya Subramanian Date: Fri, 15 Sep 2023 21:21:34 +0000 Subject: [PATCH] thermal: removed gpu cooling device as it was disabled for RCP bring up Bug: b/300639517 Test: Tested system booted to home on Caiman with updated config Change-Id: Ifb2c34ceddea7a4817cf366a700aa2315dc3e723 Signed-off-by: Ramya Subramanian --- thermal/thermal_info_config_caiman.json | 47 ------------------------- thermal/thermal_info_config_komodo.json | 47 ------------------------- thermal/thermal_info_config_tokay.json | 47 ------------------------- 3 files changed, 141 deletions(-) diff --git a/thermal/thermal_info_config_caiman.json b/thermal/thermal_info_config_caiman.json index 0b06f848..7d5c405c 100644 --- a/thermal/thermal_info_config_caiman.json +++ b/thermal/thermal_info_config_caiman.json @@ -619,48 +619,6 @@ "BindedPowerRail": "S2M_VDD_CPUCL2", "CdevCeiling": [0, 13, 13, 13, 13, 14, 14], "LimitInfo": [0, 0, 0, 0, 0, 14, 14] - }, - { - "CdevRequest": "thermal-gpufreq-0", - "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], - "MaxReleaseStep": 1, - "MaxThrottleStep": 1, - "BindedPowerRail": "S2S_VDD_G3D", - "CdevCeiling": [0, 8, 8, 8, 9, 11, 11], - "LimitInfo": [0, 0, 0, 0, 0, 11, 11] - } - ] - }, - { - "Name":"VIRTUAL-SKIN-GPU", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "TriggerSensor":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"], - "Formula":"MAXIMUM", - "Combination":["VIRTUAL-SKIN"], - "Coefficient":[1.0], - "HotThreshold":["NAN", 53.0, 55.0, 56.5, 62.0, "NAN", "NAN"], - "HotHysteresis":[0.0, 1.9, 1.9, 1.4, 1.9, 0.0, 0.0], - "Multiplier":0.001, - "PollingDelay":300000, - "PassiveDelay":7000, - "PIDInfo": { - "K_Po":["NAN", "NAN", 700, "NAN", "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", 700, "NAN", "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 5, "NAN", "NAN", "NAN", "NAN"], - "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", 1723, "NAN", "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 473, "NAN", "NAN", "NAN", "NAN"], - "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", 2500, "NAN", "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 4, "NAN", "NAN", "NAN", "NAN"] - }, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-gpufreq-0", - "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], - "CdevCeiling": [0, 8, 8, 9, 11, 11, 11] } ] }, @@ -812,11 +770,6 @@ "Type":"CPU", "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote" }, - { - "Name":"thermal-gpufreq-0", - "Type":"GPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote" - }, { "Name":"chg_mdis", "Type":"BATTERY" diff --git a/thermal/thermal_info_config_komodo.json b/thermal/thermal_info_config_komodo.json index 0b06f848..7d5c405c 100644 --- a/thermal/thermal_info_config_komodo.json +++ b/thermal/thermal_info_config_komodo.json @@ -619,48 +619,6 @@ "BindedPowerRail": "S2M_VDD_CPUCL2", "CdevCeiling": [0, 13, 13, 13, 13, 14, 14], "LimitInfo": [0, 0, 0, 0, 0, 14, 14] - }, - { - "CdevRequest": "thermal-gpufreq-0", - "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], - "MaxReleaseStep": 1, - "MaxThrottleStep": 1, - "BindedPowerRail": "S2S_VDD_G3D", - "CdevCeiling": [0, 8, 8, 8, 9, 11, 11], - "LimitInfo": [0, 0, 0, 0, 0, 11, 11] - } - ] - }, - { - "Name":"VIRTUAL-SKIN-GPU", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "TriggerSensor":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"], - "Formula":"MAXIMUM", - "Combination":["VIRTUAL-SKIN"], - "Coefficient":[1.0], - "HotThreshold":["NAN", 53.0, 55.0, 56.5, 62.0, "NAN", "NAN"], - "HotHysteresis":[0.0, 1.9, 1.9, 1.4, 1.9, 0.0, 0.0], - "Multiplier":0.001, - "PollingDelay":300000, - "PassiveDelay":7000, - "PIDInfo": { - "K_Po":["NAN", "NAN", 700, "NAN", "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", 700, "NAN", "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 5, "NAN", "NAN", "NAN", "NAN"], - "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", 1723, "NAN", "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 473, "NAN", "NAN", "NAN", "NAN"], - "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", 2500, "NAN", "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 4, "NAN", "NAN", "NAN", "NAN"] - }, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-gpufreq-0", - "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], - "CdevCeiling": [0, 8, 8, 9, 11, 11, 11] } ] }, @@ -812,11 +770,6 @@ "Type":"CPU", "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote" }, - { - "Name":"thermal-gpufreq-0", - "Type":"GPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote" - }, { "Name":"chg_mdis", "Type":"BATTERY" diff --git a/thermal/thermal_info_config_tokay.json b/thermal/thermal_info_config_tokay.json index 4a4278a4..4534218c 100644 --- a/thermal/thermal_info_config_tokay.json +++ b/thermal/thermal_info_config_tokay.json @@ -619,48 +619,6 @@ "BindedPowerRail": "S2M_VDD_CPUCL2", "CdevCeiling": [0, 13, 13, 13, 13, 14, 14], "LimitInfo": [0, 0, 0, 0, 0, 14, 14] - }, - { - "CdevRequest": "thermal-gpufreq-0", - "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], - "MaxReleaseStep": 1, - "MaxThrottleStep": 1, - "BindedPowerRail": "S2S_VDD_G3D", - "CdevCeiling": [0, 8, 8, 8, 9, 11, 11], - "LimitInfo": [0, 0, 0, 0, 0, 11, 11] - } - ] - }, - { - "Name":"VIRTUAL-SKIN-GPU", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "TriggerSensor":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"], - "Formula":"MAXIMUM", - "Combination":["VIRTUAL-SKIN"], - "Coefficient":[1.0], - "HotThreshold":["NAN", 53.0, 55.0, 56.5, 62.0, "NAN", "NAN"], - "HotHysteresis":[0.0, 1.9, 1.9, 1.4, 1.9, 0.0, 0.0], - "Multiplier":0.001, - "PollingDelay":300000, - "PassiveDelay":7000, - "PIDInfo": { - "K_Po":["NAN", "NAN", 700, "NAN", "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", 700, "NAN", "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 5, "NAN", "NAN", "NAN", "NAN"], - "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", 1723, "NAN", "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 473, "NAN", "NAN", "NAN", "NAN"], - "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", 2500, "NAN", "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 4, "NAN", "NAN", "NAN", "NAN"] - }, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-gpufreq-0", - "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], - "CdevCeiling": [0, 8, 8, 9, 11, 11, 11] } ] }, @@ -812,11 +770,6 @@ "Type":"CPU", "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote" }, - { - "Name":"thermal-gpufreq-0", - "Type":"GPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote" - }, { "Name":"chg_mdis", "Type":"BATTERY"