From 22f1e0e8e48757daab52290f762ce4b67de349a0 Mon Sep 17 00:00:00 2001 From: Evan Quan Date: Tue, 26 May 2020 17:06:04 +0800 Subject: [PATCH] drm/amd/powerplay: give better names for the thermal IRQ related APIs Thermal control is performed by PMFW. What handled in driver is just whether or not to enable the alert(to driver). Signed-off-by: Evan Quan Reviewed-by: Alex Deucher Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 8 ++++---- drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 4 ++-- drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 4 ++-- drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 4 ++-- drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 4 ++-- drivers/gpu/drm/amd/powerplay/smu_internal.h | 8 ++++---- drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 4 ++-- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c index 0dd94291ca366..1f8ced4c4e2db 100644 --- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c @@ -1346,7 +1346,7 @@ static int smu_hw_init(void *handle) if (ret) goto failed; - ret = smu_start_thermal_control(smu); + ret = smu_enable_thermal_alert(smu); if (ret) goto failed; @@ -1392,7 +1392,7 @@ static int smu_hw_fini(void *handle) smu_i2c_eeprom_fini(smu, &adev->pm.smu_i2c); - ret = smu_stop_thermal_control(smu); + ret = smu_disable_thermal_alert(smu); if (ret) { pr_warn("Fail to stop thermal control!\n"); return ret; @@ -1533,7 +1533,7 @@ static int smu_suspend(void *handle) smu_i2c_eeprom_fini(smu, &adev->pm.smu_i2c); - ret = smu_stop_thermal_control(smu); + ret = smu_disable_thermal_alert(smu); if (ret) { pr_warn("Fail to stop thermal control!\n"); return ret; @@ -1578,7 +1578,7 @@ static int smu_resume(void *handle) if (ret) goto failed; - ret = smu_start_thermal_control(smu); + ret = smu_enable_thermal_alert(smu); if (ret) goto failed; diff --git a/drivers/gpu/drm/amd/powerplay/arcturus_ppt.c b/drivers/gpu/drm/amd/powerplay/arcturus_ppt.c index 5c1b2d7abcaa4..302b7e9cb5bac 100644 --- a/drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +++ b/drivers/gpu/drm/amd/powerplay/arcturus_ppt.c @@ -2442,8 +2442,8 @@ static const struct pptable_funcs arcturus_ppt_funcs = { .set_power_limit = smu_v11_0_set_power_limit, .get_current_clk_freq = smu_v11_0_get_current_clk_freq, .init_max_sustainable_clocks = smu_v11_0_init_max_sustainable_clocks, - .start_thermal_control = smu_v11_0_start_thermal_control, - .stop_thermal_control = smu_v11_0_stop_thermal_control, + .enable_thermal_alert = smu_v11_0_enable_thermal_alert, + .disable_thermal_alert = smu_v11_0_disable_thermal_alert, .set_deep_sleep_dcefclk = smu_v11_0_set_deep_sleep_dcefclk, .display_clock_voltage_request = smu_v11_0_display_clock_voltage_request, .get_fan_control_mode = smu_v11_0_get_fan_control_mode, diff --git a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h index 1223d298c03fe..5bb1ac821aeb4 100644 --- a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +++ b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h @@ -530,8 +530,8 @@ struct pptable_funcs { int (*set_power_limit)(struct smu_context *smu, uint32_t n); int (*get_current_clk_freq)(struct smu_context *smu, enum smu_clk_type clk_id, uint32_t *value); int (*init_max_sustainable_clocks)(struct smu_context *smu); - int (*start_thermal_control)(struct smu_context *smu); - int (*stop_thermal_control)(struct smu_context *smu); + int (*enable_thermal_alert)(struct smu_context *smu); + int (*disable_thermal_alert)(struct smu_context *smu); int (*set_deep_sleep_dcefclk)(struct smu_context *smu, uint32_t clk); int (*set_active_display_count)(struct smu_context *smu, uint32_t count); int (*store_cc6_data)(struct smu_context *smu, uint32_t separation_time, diff --git a/drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h b/drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h index f3f34a0f56028..71f829ab306ed 100644 --- a/drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h +++ b/drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h @@ -207,9 +207,9 @@ int smu_v11_0_get_current_clk_freq(struct smu_context *smu, int smu_v11_0_init_max_sustainable_clocks(struct smu_context *smu); -int smu_v11_0_start_thermal_control(struct smu_context *smu); +int smu_v11_0_enable_thermal_alert(struct smu_context *smu); -int smu_v11_0_stop_thermal_control(struct smu_context *smu); +int smu_v11_0_disable_thermal_alert(struct smu_context *smu); int smu_v11_0_read_sensor(struct smu_context *smu, enum amd_pp_sensors sensor, diff --git a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c index ef4952afb3650..68142f6798c66 100644 --- a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c +++ b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c @@ -2320,8 +2320,8 @@ static const struct pptable_funcs navi10_ppt_funcs = { .set_power_limit = smu_v11_0_set_power_limit, .get_current_clk_freq = smu_v11_0_get_current_clk_freq, .init_max_sustainable_clocks = smu_v11_0_init_max_sustainable_clocks, - .start_thermal_control = smu_v11_0_start_thermal_control, - .stop_thermal_control = smu_v11_0_stop_thermal_control, + .enable_thermal_alert = smu_v11_0_enable_thermal_alert, + .disable_thermal_alert = smu_v11_0_disable_thermal_alert, .set_deep_sleep_dcefclk = smu_v11_0_set_deep_sleep_dcefclk, .display_clock_voltage_request = smu_v11_0_display_clock_voltage_request, .get_fan_control_mode = smu_v11_0_get_fan_control_mode, diff --git a/drivers/gpu/drm/amd/powerplay/smu_internal.h b/drivers/gpu/drm/amd/powerplay/smu_internal.h index 6b627d6e80b1b..6c59eeef2590f 100644 --- a/drivers/gpu/drm/amd/powerplay/smu_internal.h +++ b/drivers/gpu/drm/amd/powerplay/smu_internal.h @@ -118,10 +118,10 @@ static inline int smu_send_smc_msg(struct smu_context *smu, enum smu_message_typ ((smu)->ppt_funcs->tables_init ? (smu)->ppt_funcs->tables_init((smu), (tab)) : 0) #define smu_set_thermal_fan_table(smu) \ ((smu)->ppt_funcs->set_thermal_fan_table ? (smu)->ppt_funcs->set_thermal_fan_table((smu)) : 0) -#define smu_start_thermal_control(smu) \ - ((smu)->ppt_funcs->start_thermal_control? (smu)->ppt_funcs->start_thermal_control((smu)) : 0) -#define smu_stop_thermal_control(smu) \ - ((smu)->ppt_funcs->stop_thermal_control? (smu)->ppt_funcs->stop_thermal_control((smu)) : 0) +#define smu_enable_thermal_alert(smu) \ + ((smu)->ppt_funcs->enable_thermal_alert? (smu)->ppt_funcs->enable_thermal_alert((smu)) : 0) +#define smu_disable_thermal_alert(smu) \ + ((smu)->ppt_funcs->disable_thermal_alert? (smu)->ppt_funcs->disable_thermal_alert((smu)) : 0) #define smu_smc_read_sensor(smu, sensor, data, size) \ ((smu)->ppt_funcs->read_sensor? (smu)->ppt_funcs->read_sensor((smu), (sensor), (data), (size)) : -EINVAL) diff --git a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c index 731e58677c364..0bd6c8aba9528 100644 --- a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c +++ b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c @@ -1176,7 +1176,7 @@ static int smu_v11_0_set_thermal_range(struct smu_context *smu, return 0; } -int smu_v11_0_start_thermal_control(struct smu_context *smu) +int smu_v11_0_enable_thermal_alert(struct smu_context *smu) { int ret = 0; struct smu_temperature_range range; @@ -1215,7 +1215,7 @@ int smu_v11_0_start_thermal_control(struct smu_context *smu) return ret; } -int smu_v11_0_stop_thermal_control(struct smu_context *smu) +int smu_v11_0_disable_thermal_alert(struct smu_context *smu) { return amdgpu_irq_put(smu->adev, smu->irq_source, 0); } -- 2.30.2