drm/amd/pp: Refine add irq logic in powerplay
Subsystems (2)
PATCH 1/1 drm/amd/pp: Refine add irq logic in powerplay
1. register smu irq when sw init.
2. delete useless function argument.
Change-Id Ie817e524327f14edfde62843fbdd2a7999489819
Signed-off-by Rex Zhu <[email protected]>
--- drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 2 ++ drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 6 +++--- drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 4 ---- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 5 ++--- drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 5 ++--- drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h | 2 +- drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 3 +-- 7 files changed, 11 insertions(+), 16 deletions(-)
drivers/gpu/drm/amd/powerplay/amd_powerplay.c +2 -0
@@ -117,6 +117,8 @@ static int pp_sw_init(void *handle) ret = hwmgr->smumgr_funcs->smu_init (hwmgr); +phm_register_irq_handlers (hwmgr); +pr_debug ("amdgpu: powerplay sw initialized\n" ); }
drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c +3 -3
@@ -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 ; }
drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c +0 -4
@@ -200,10 +200,6 @@ int hwmgr_hw_init(struct pp_hwmgr *hwmgr)if (ret) goto err2; - ret =phm_register_thermal_interrupt (hwmgr,NULL ); -if (ret) - goto err2; -return 0 ; err2:if (hwmgr->hwmgr_func->backend_fini)
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +2 -3
@@ -3996,8 +3996,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 ; }
@@ -4982,7 +4981,7 @@ static int smu7_set_power_profile_mode(struct pp_hwmgr *hwmgr, long *input, uint .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,
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +2 -3
@@ -4819,8 +4819,7 @@ static int vega10_get_thermal_temperature_range(struct pp_hwmgr *hwmgr, .process = phm_irq_process, }; -static int vega10_register_thermal_interrupt (struct pp_hwmgr *hwmgr, -const void *info) +static int vega10_register_irq_handlers (struct pp_hwmgr *hwmgr) {struct amdgpu_irq_src *source =kzalloc (sizeof (struct amdgpu_irq_src ),GFP_KERNEL );
@@ -4978,7 +4977,7 @@ static int vega10_set_power_profile_mode(struct pp_hwmgr *hwmgr, long *input, ui .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 = vega10_register_thermal_interrupt, + .register_irq_handlers = vega10_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,
drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h +1 -1
@@ -403,7 +403,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);
drivers/gpu/drm/amd/powerplay/inc/hwmgr.h +1 -2
@@ -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,
Signature · 6 lines
1.9.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1521608083-12837-1-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org
Alex Deucher
Reviewed-byQuoted 2 lines · Rex Zhu
1. register smu irq when sw init.
2. delete useless function argument.
If you split this into two patches, one for each logical change above, it's:
Reviewed-by Alex Deucher <[email protected]>
Quoted 137 lines
Change-Id Ie817e524327f14edfde62843fbdd2a7999489819Signed-off-by Rex Zhu <[email protected]>--- drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 2 ++ drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 6 +++--- drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 4 ---- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 5 ++--- drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 5 ++--- drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h | 2 +- drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 3 +-- 7 files changed, 11 insertions(+), 16 deletions(-)drivers/gpu/drm/amd/powerplay/amd_powerplay.c +2
-0@@ -117,6 +117,8 @@ static int pp_sw_init(void *handle) ret = hwmgr->smumgr_funcs->smu_init (hwmgr); +phm_register_irq_handlers (hwmgr); +pr_debug ("amdgpu: powerplay sw initialized\n" ); }drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c +3
-3@@ -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 ; }drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c +0
-4@@ -200,10 +200,6 @@ int hwmgr_hw_init(struct pp_hwmgr *hwmgr)if (ret) goto err2; - ret =phm_register_thermal_interrupt (hwmgr,NULL ); -if (ret) - goto err2; -return 0 ; err2:if (hwmgr->hwmgr_func->backend_fini)drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +2
-3@@ -3996,8 +3996,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 ; }@@ -4982,7 +4981,7 @@ static int smu7_set_power_profile_mode(struct pp_hwmgr *hwmgr, long *input, uint .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,drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +2
-3@@ -4819,8 +4819,7 @@ static int vega10_get_thermal_temperature_range(struct pp_hwmgr *hwmgr, .process = phm_irq_process, }; -static int vega10_register_thermal_interrupt (struct pp_hwmgr *hwmgr, -const void *info) +static int vega10_register_irq_handlers (struct pp_hwmgr *hwmgr) {struct amdgpu_irq_src *source =kzalloc (sizeof (struct amdgpu_irq_src ),GFP_KERNEL );@@ -4978,7 +4977,7 @@ static int vega10_set_power_profile_mode(struct pp_hwmgr *hwmgr, long *input, ui .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 = vega10_register_thermal_interrupt, + .register_irq_handlers = vega10_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,drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h +1
-1@@ -403,7 +403,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);drivers/gpu/drm/amd/powerplay/inc/hwmgr.h +1
-3@@ -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, --1.9.1
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx