diff options
author | Evan Quan <evan.quan@amd.com> | 2017-12-28 01:18:15 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2018-02-19 14:17:04 -0500 |
commit | 8053e976cfe69afd5453a357761a885a2085c6c1 (patch) | |
tree | d4aa114bbc5f20f69445decff3b2dde70010b176 | |
parent | 94af870a633831bd167c42472067d14c5ccb607b (diff) |
drm/amd/powerplay: remove unused parameter of phm_start_thermal_controller (v2)
Unused.
v2: squash in warning fix (Harry)
Signed-off-by: Evan Quan <evan.quan@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r-- | drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 14 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h | 2 |
3 files changed, 6 insertions, 14 deletions
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c b/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c index 2b0c53fe4c8d..e23f63ea07cd 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | |||
@@ -223,20 +223,12 @@ int phm_register_thermal_interrupt(struct pp_hwmgr *hwmgr, const void *info) | |||
223 | * Initializes the thermal controller subsystem. | 223 | * Initializes the thermal controller subsystem. |
224 | * | 224 | * |
225 | * @param pHwMgr the address of the powerplay hardware manager. | 225 | * @param pHwMgr the address of the powerplay hardware manager. |
226 | * @param pTemperatureRange the address of the structure holding the temperature range. | ||
227 | * @exception PP_Result_Failed if any of the paramters is NULL, otherwise the return value from the dispatcher. | 226 | * @exception PP_Result_Failed if any of the paramters is NULL, otherwise the return value from the dispatcher. |
228 | */ | 227 | */ |
229 | int phm_start_thermal_controller(struct pp_hwmgr *hwmgr, struct PP_TemperatureRange *temperature_range) | 228 | int phm_start_thermal_controller(struct pp_hwmgr *hwmgr) |
230 | { | 229 | { |
231 | struct PP_TemperatureRange range; | 230 | struct PP_TemperatureRange range = {TEMP_RANGE_MIN, TEMP_RANGE_MAX}; |
232 | 231 | ||
233 | if (temperature_range == NULL) { | ||
234 | range.max = TEMP_RANGE_MAX; | ||
235 | range.min = TEMP_RANGE_MIN; | ||
236 | } else { | ||
237 | range.max = temperature_range->max; | ||
238 | range.min = temperature_range->min; | ||
239 | } | ||
240 | if (phm_cap_enabled(hwmgr->platform_descriptor.platformCaps, | 232 | if (phm_cap_enabled(hwmgr->platform_descriptor.platformCaps, |
241 | PHM_PlatformCaps_ThermalController) | 233 | PHM_PlatformCaps_ThermalController) |
242 | && hwmgr->hwmgr_func->start_thermal_controller != NULL) | 234 | && hwmgr->hwmgr_func->start_thermal_controller != NULL) |
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c index 0229f774f7a9..ec3cdf5a2d4a 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | |||
@@ -261,7 +261,7 @@ int hwmgr_hw_init(struct pp_instance *handle) | |||
261 | ret = phm_enable_dynamic_state_management(hwmgr); | 261 | ret = phm_enable_dynamic_state_management(hwmgr); |
262 | if (ret) | 262 | if (ret) |
263 | goto err2; | 263 | goto err2; |
264 | ret = phm_start_thermal_controller(hwmgr, NULL); | 264 | ret = phm_start_thermal_controller(hwmgr); |
265 | ret |= psm_set_performance_states(hwmgr); | 265 | ret |= psm_set_performance_states(hwmgr); |
266 | if (ret) | 266 | if (ret) |
267 | goto err2; | 267 | goto err2; |
@@ -341,7 +341,7 @@ int hwmgr_hw_resume(struct pp_instance *handle) | |||
341 | ret = phm_enable_dynamic_state_management(hwmgr); | 341 | ret = phm_enable_dynamic_state_management(hwmgr); |
342 | if (ret) | 342 | if (ret) |
343 | return ret; | 343 | return ret; |
344 | ret = phm_start_thermal_controller(hwmgr, NULL); | 344 | ret = phm_start_thermal_controller(hwmgr); |
345 | if (ret) | 345 | if (ret) |
346 | return ret; | 346 | return ret; |
347 | 347 | ||
diff --git a/drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h b/drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h index 5716b937a6ad..f919301912e5 100644 --- a/drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h +++ b/drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h | |||
@@ -393,7 +393,7 @@ extern int phm_force_dpm_levels(struct pp_hwmgr *hwmgr, enum amd_dpm_forced_leve | |||
393 | extern int phm_display_configuration_changed(struct pp_hwmgr *hwmgr); | 393 | extern int phm_display_configuration_changed(struct pp_hwmgr *hwmgr); |
394 | extern int phm_notify_smc_display_config_after_ps_adjustment(struct pp_hwmgr *hwmgr); | 394 | extern int phm_notify_smc_display_config_after_ps_adjustment(struct pp_hwmgr *hwmgr); |
395 | extern int phm_register_thermal_interrupt(struct pp_hwmgr *hwmgr, const void *info); | 395 | extern int phm_register_thermal_interrupt(struct pp_hwmgr *hwmgr, const void *info); |
396 | extern int phm_start_thermal_controller(struct pp_hwmgr *hwmgr, struct PP_TemperatureRange *temperature_range); | 396 | extern int phm_start_thermal_controller(struct pp_hwmgr *hwmgr); |
397 | extern int phm_stop_thermal_controller(struct pp_hwmgr *hwmgr); | 397 | extern int phm_stop_thermal_controller(struct pp_hwmgr *hwmgr); |
398 | extern bool phm_check_smc_update_required_for_display_configuration(struct pp_hwmgr *hwmgr); | 398 | extern bool phm_check_smc_update_required_for_display_configuration(struct pp_hwmgr *hwmgr); |
399 | 399 | ||