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 <evan.quan@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
index 0dd94291ca36637eaf7b64c26eb0122f9b41f0ed..1f8ced4c4e2dbf291f5ca6bd8e6f813ae59fe9e5 100644 (file)
--- 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 5c1b2d7abcaa4ffef26a7335c19bd28f63606ab2..302b7e9cb5bac9c5c88d84dfbe6b67aa4cee0dcb 100644 (file)
--- 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 1223d298c03fe32f77923272d4835b868ff4cae6..5bb1ac821aeb478f77c0c605cf58bbbea825e0c7 100644 (file)
--- 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 f3f34a0f56028f08bfc9d8a4c505c236ca6b58a8..71f829ab306edc4b3969200f1b5e524d465245de 100644 (file)
--- 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 ef4952afb3650d72dc5a0cc1e64e335f51d2f127..68142f6798c660a030982ccc1005f8e596fbffcf 100644 (file)
--- 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 6b627d6e80b1bfdde4cfac50eefed710998782cd..6c59eeef2590fb565b86e1752cc57dfbdca1b346 100644 (file)
--- 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 731e58677c3647108f8289035354449016524ffd..0bd6c8aba95289a1f028c324ec8b9a2fee476125 100644 (file)
--- 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);
 }