Merge "thermal: removed gpu cooling device as it was disabled for RCP bring up" into main

This commit is contained in:
Wei Wang 2023-09-16 15:47:10 +00:00 committed by Android (Google) Code Review
commit 43c777bc77
3 changed files with 0 additions and 141 deletions

View file

@ -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"

View file

@ -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"

View file

@ -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"