drm/amd/pp: Refine register_thermal_interrupt function

v2: add Vega12 support

1. delete useless argument in function register_thermal_interrupt
2. rename function name register_thermal_interrupt to register_irq_handlers

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c b/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c
index b784131d0f87c82156a65c16b8f7a2b7ffc3a0a8..ae2e9339dd6b7cd96fa266d5f16b1ff1452734dc 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c
@@ -202,12 +202,12 @@ int phm_stop_thermal_controller(struct pp_hwmgr *hwmgr)
        return hwmgr->hwmgr_func->stop_thermal_controller(hwmgr);
 }
 
-int phm_register_thermal_interrupt(struct pp_hwmgr *hwmgr, const void *info)
+int phm_register_irq_handlers(struct pp_hwmgr *hwmgr)
 {
        PHM_FUNC_CHECK(hwmgr);
 
-       if (hwmgr->hwmgr_func->register_internal_thermal_interrupt != NULL)
-               return hwmgr->hwmgr_func->register_internal_thermal_interrupt(hwmgr, info);
+       if (hwmgr->hwmgr_func->register_irq_handlers != NULL)
+               return hwmgr->hwmgr_func->register_irq_handlers(hwmgr);
 
        return 0;
 }

diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
index ce581ae1103a68e5d8059dc3f01f4632e1fed92a..bafcfd2cf156a32e782fd0c7f12abda1c2f67b10 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
@@ -206,7 +206,7 @@ int hwmgr_hw_init(struct pp_hwmgr *hwmgr)
        if (ret)
                goto err2;
 
-       ret = phm_register_thermal_interrupt(hwmgr, NULL);
+       ret = phm_register_irq_handlers(hwmgr);
        if (ret)
                goto err2;
 

diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
index 478e31d5da0f0893f5adade4d9ef8bba332c0b71..d699861fd76d2b3060e5a714135c9ba233185d76 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
@@ -3998,8 +3998,7 @@ static int smu7_set_max_fan_rpm_output(struct pp_hwmgr *hwmgr, uint16_t us_max_f
                        PPSMC_MSG_SetFanRpmMax, us_max_fan_rpm);
 }
 
-static int smu7_register_internal_thermal_interrupt(struct pp_hwmgr *hwmgr,
-                                       const void *thermal_interrupt_info)
+static int smu7_register_irq_handlers(struct pp_hwmgr *hwmgr)
 {
        return 0;
 }
@@ -4984,7 +4983,7 @@ static const struct pp_hwmgr_func smu7_hwmgr_funcs = {
        .get_fan_speed_rpm = smu7_fan_ctrl_get_fan_speed_rpm,
        .set_fan_speed_rpm = smu7_fan_ctrl_set_fan_speed_rpm,
        .uninitialize_thermal_controller = smu7_thermal_ctrl_uninitialize_thermal_controller,
-       .register_internal_thermal_interrupt = smu7_register_internal_thermal_interrupt,
+       .register_irq_handlers = smu7_register_irq_handlers,
        .check_smc_update_required_for_display_configuration = smu7_check_smc_update_required_for_display_configuration,
        .check_states_equal = smu7_check_states_equal,
        .set_fan_control_mode = smu7_set_fan_control_mode,

diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.c b/drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.c
index 1f6d481826ffdf32413b478b2d8d2a413057702d..598122854ab58aa4de995bf2053d1cad2acbf9ab 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.c
@@ -581,8 +581,7 @@ static const struct amdgpu_irq_src_funcs smu9_irq_funcs = {
        .process = phm_irq_process,
 };
 
-int smu9_register_thermal_interrupt(struct pp_hwmgr *hwmgr,
-               const void *info)
+int smu9_register_irq_handlers(struct pp_hwmgr *hwmgr)
 {
        struct amdgpu_irq_src *source =
                kzalloc(sizeof(struct amdgpu_irq_src), GFP_KERNEL);

diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.h b/drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.h
index 6a43a2ac530463acb0ddec001c27442fe0046ae0..6429dc2f2df94356da66f787ed581a41e21d616a 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.h
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.h
@@ -77,8 +77,7 @@ int phm_irq_process(struct amdgpu_device *adev,
                           struct amdgpu_irq_src *source,
                           struct amdgpu_iv_entry *entry);
 
-int smu9_register_thermal_interrupt(struct pp_hwmgr *hwmgr,
-               const void *info);
+int smu9_register_irq_handlers(struct pp_hwmgr *hwmgr);
 
 #define PHM_FIELD_SHIFT(reg, field) reg##__##field##__SHIFT
 #define PHM_FIELD_MASK(reg, field) reg##__##field##_MASK

diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c
index bb2eb1cd05a913bfac1ffc47d9cad92dc9e93e3d..7cbb56ba6fab9165dabf014dec43b83514d9c0f1 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c
@@ -4939,7 +4939,7 @@ static const struct pp_hwmgr_func vega10_hwmgr_funcs = {
        .avfs_control = vega10_avfs_enable,
        .notify_cac_buffer_info = vega10_notify_cac_buffer_info,
        .get_thermal_temperature_range = vega10_get_thermal_temperature_range,
-       .register_internal_thermal_interrupt = smu9_register_thermal_interrupt,
+       .register_irq_handlers = smu9_register_irq_handlers,
        .start_thermal_controller = vega10_start_thermal_controller,
        .get_power_profile_mode = vega10_get_power_profile_mode,
        .set_power_profile_mode = vega10_set_power_profile_mode,

diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c
index b9f8ec5df8a7ab17cdd8cfd4424d5fca2b6d6090..da2053e106719945b9c19be31367b9e5798a35cf 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c
@@ -2557,7 +2557,7 @@ static const struct pp_hwmgr_func vega12_hwmgr_funcs = {
 #endif
        .notify_cac_buffer_info = vega12_notify_cac_buffer_info,
        .get_thermal_temperature_range = vega12_get_thermal_temperature_range,
-       .register_internal_thermal_interrupt = smu9_register_thermal_interrupt,
+       .register_irq_handlers = smu9_register_irq_handlers,
        .start_thermal_controller = vega12_start_thermal_controller,
 };
 

diff --git a/drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h b/drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h
index 19f2e43480cbb3319daff6517f0662581cd1272d..8b78bbecd1bc565e4086b4eb67e18e082ef9da76 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h
+++ b/drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h
@@ -417,7 +417,7 @@ extern int phm_apply_state_adjust_rules(struct pp_hwmgr *hwmgr,
 extern int phm_force_dpm_levels(struct pp_hwmgr *hwmgr, enum amd_dpm_forced_level level);
 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_register_irq_handlers(struct pp_hwmgr *hwmgr);
 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);

diff --git a/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h b/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h
index 985fe8d5bf7db6504d95ab6f531c7db26679249b..d742d9d087f08c87b3f208b5d455ac755bba166e 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h
+++ b/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h
@@ -287,8 +287,7 @@ struct pp_hwmgr_func {
        int (*get_fan_speed_rpm)(struct pp_hwmgr *hwmgr, uint32_t *speed);
        int (*reset_fan_speed_to_default)(struct pp_hwmgr *hwmgr);
        int (*uninitialize_thermal_controller)(struct pp_hwmgr *hwmgr);
-       int (*register_internal_thermal_interrupt)(struct pp_hwmgr *hwmgr,
-                                       const void *thermal_interrupt_info);
+       int (*register_irq_handlers)(struct pp_hwmgr *hwmgr);
        bool (*check_smc_update_required_for_display_configuration)(struct pp_hwmgr *hwmgr);
        int (*check_states_equal)(struct pp_hwmgr *hwmgr,
                                        const struct pp_hw_power_state *pstate1,