[PATCH 2/4] drm/amd/powerplay: remove unused parameter of phm_start_thermal_controller

Deucher, Alexander Alexander.Deucher at amd.com
Sat Dec 30 18:31:14 UTC 2017


Should this be used to set the default critical temperatures?  IIRC, they were set to 0 until last week when someone sent a patch to fix them.


Alex


________________________________
From: amd-gfx <amd-gfx-bounces at lists.freedesktop.org> on behalf of Evan Quan <evan.quan at amd.com>
Sent: Friday, December 29, 2017 2:44 AM
To: amd-gfx at lists.freedesktop.org
Cc: Quan, Evan
Subject: [PATCH 2/4] drm/amd/powerplay: remove unused parameter of phm_start_thermal_controller

Change-Id: Id6039cb50b73bdf8a6df37e5383f4bea4ae737ed
Signed-off-by: Evan Quan <evan.quan at amd.com>
---
 drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 14 +++-----------
 drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c           |  4 ++--
 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 623cff9..cba0aee 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c
@@ -220,20 +220,12 @@ int phm_register_thermal_interrupt(struct pp_hwmgr *hwmgr, const void *info)
 * Initializes the thermal controller subsystem.
 *
 * @param    pHwMgr  the address of the powerplay hardware manager.
-* @param    pTemperatureRange the address of the structure holding the temperature range.
 * @exception PP_Result_Failed if any of the paramters is NULL, otherwise the return value from the dispatcher.
 */
-int phm_start_thermal_controller(struct pp_hwmgr *hwmgr, struct PP_TemperatureRange *temperature_range)
+int phm_start_thermal_controller(struct pp_hwmgr *hwmgr)
 {
-       struct PP_TemperatureRange range;
-
-       if (temperature_range == NULL) {
-               range.max = TEMP_RANGE_MAX;
-               range.min = TEMP_RANGE_MIN;
-       } else {
-               range.max = temperature_range->max;
-               range.min = temperature_range->min;
-       }
+       struct PP_TemperatureRange range = {{TEMP_RANGE_MIN, TEMP_RANGE_MAX}};
+
         if (phm_cap_enabled(hwmgr->platform_descriptor.platformCaps,
                         PHM_PlatformCaps_ThermalController)
                         && 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 08b7963..38f7d0d 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
@@ -265,7 +265,7 @@ int hwmgr_hw_init(struct pp_instance *handle)
         ret = phm_enable_dynamic_state_management(hwmgr);
         if (ret)
                 goto err2;
-       ret = phm_start_thermal_controller(hwmgr, NULL);
+       ret = phm_start_thermal_controller(hwmgr);
         ret |= psm_set_performance_states(hwmgr);
         if (ret)
                 goto err2;
@@ -345,7 +345,7 @@ int hwmgr_hw_resume(struct pp_instance *handle)
         ret = phm_enable_dynamic_state_management(hwmgr);
         if (ret)
                 return ret;
-       ret = phm_start_thermal_controller(hwmgr, NULL);
+       ret = phm_start_thermal_controller(hwmgr);
         if (ret)
                 return ret;

diff --git a/drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h b/drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h
index b8bd86b..7489003 100644
--- a/drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h
+++ b/drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h
@@ -407,7 +407,7 @@ extern int phm_force_dpm_levels(struct pp_hwmgr *hwmgr, enum amd_dpm_forced_leve
 extern int phm_display_configuration_changed(struct pp_hwmgr *hwmgr);
 extern int phm_notify_smc_display_config_after_ps_adjustment(struct pp_hwmgr *hwmgr);
 extern int phm_register_thermal_interrupt(struct pp_hwmgr *hwmgr, const void *info);
-extern int phm_start_thermal_controller(struct pp_hwmgr *hwmgr, struct PP_TemperatureRange *temperature_range);
+extern int phm_start_thermal_controller(struct pp_hwmgr *hwmgr);
 extern int phm_stop_thermal_controller(struct pp_hwmgr *hwmgr);
 extern bool phm_check_smc_update_required_for_display_configuration(struct pp_hwmgr *hwmgr);

--
2.7.4

_______________________________________________
amd-gfx mailing list
amd-gfx at lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/amd-gfx/attachments/20171230/14405781/attachment.html>


More information about the amd-gfx mailing list