diff options
| author | CNSS_WLAN Service <cnssbldsw@qualcomm.com> | 2018-09-28 09:04:13 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-09-28 09:04:13 -0700 |
| commit | b56f324f8ea836d2a52402b01eda7adab5a49c30 (patch) | |
| tree | c32ea73384696555a5a95e825b95c2e41ae1c47d | |
| parent | 079df6f8a275699e6e2c116b86f101ebc7b2e36b (diff) | |
| parent | 2432d68cb3223d1fab8cc7f532d0a3fa502a1a5e (diff) | |
Merge "qcacld-2.0: Send thermal events for userbased FW throttling" into wlan-cld2.driver.lnx.1.0
| -rw-r--r-- | CORE/SERVICES/WMA/wma.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/CORE/SERVICES/WMA/wma.c b/CORE/SERVICES/WMA/wma.c index ae38c8c30516..e6f0c9bc4536 100644 --- a/CORE/SERVICES/WMA/wma.c +++ b/CORE/SERVICES/WMA/wma.c @@ -29582,8 +29582,16 @@ static bool need_thermal_temperature_ind(tp_thermal_mgmt info, int32_t degree_c) #ifdef FEATURE_WLAN_THERMAL_SHUTDOWN static void -wma_thermal_shutdown_evt_handler(tp_thermal_mgmt info, int32_t degree_c) +wma_thermal_shutdown_evt_handler(tp_wma_handle wma, int32_t degree_c) { + tp_thermal_mgmt info = &wma->thermal_mgmt_info; + + if ((!wma->thermal_mgmt_info.thermalMgmtEnabled) + && (wma->fw_therm_throt_enabled)) { + wma_thermal_temperature_ind(degree_c); + return; + } + if (!info->thermal_shutdown_enabled) return; @@ -29618,7 +29626,7 @@ static inline void wma_fetch_set_thermal_params(tp_wma_handle wma, } static inline void -wma_thermal_shutdown_evt_handler(tp_thermal_mgmt info, int32_t degree_c) +wma_thermal_shutdown_evt_handler(tp_wma_handle wma, int32_t degree_c) { return; } @@ -36556,7 +36564,7 @@ static int wma_thermal_mgmt_evt_handler(void *handle, u_int8_t *event, ret = wma_thermal_throttle_handler(handle, tm_event->temperature_degreeC); - wma_thermal_shutdown_evt_handler(&wma->thermal_mgmt_info, + wma_thermal_shutdown_evt_handler(wma, tm_event->temperature_degreeC); return ret; |