drm/amd/powerplay: avoid unnecessary dpm level setting
Subsystems (2)
PATCH 1/2 drm/amd/powerplay: avoid unnecessary dpm level setting
No dpm level setting is needed when the request level is actually same as current.
--- drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c +2 -1
@@ -278,7 +278,8 @@ int psm_adjust_power_state_dynamic(struct pp_hwmgr *hwmgr, bool skip,phm_notify_smc_display_config_after_ps_adjustment (hwmgr); -if (!phm_force_dpm_levels (hwmgr, hwmgr->request_dpm_level)) +if ((hwmgr->request_dpm_level != hwmgr->dpm_level) && + !phm_force_dpm_levels (hwmgr, hwmgr->request_dpm_level)) hwmgr->dpm_level = hwmgr->request_dpm_level;if (hwmgr->dpm_level !=AMD_DPM_FORCED_LEVEL_MANUAL ) {
Signature · 6 lines
2.20.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): [email protected]
PATCH 2/2 drm/amd/powerplay: enforce display related settings only on needed
No display related settings are needed on dpm level change.
--- drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 10 +++++----- drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c | 11 +++++------ drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.h | 2 +- 3 files changed, 11 insertions(+), 12 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c +5 -5
@@ -273,7 +273,7 @@ int hwmgr_hw_fini(struct pp_hwmgr *hwmgr)phm_stop_thermal_controller (hwmgr);psm_set_boot_states (hwmgr); -psm_adjust_power_state_dynamic (hwmgr, false,NULL ); +psm_adjust_power_state_dynamic (hwmgr, true,NULL );phm_disable_dynamic_state_management (hwmgr);phm_disable_clock_power_gatings (hwmgr);
@@ -295,7 +295,7 @@ int hwmgr_suspend(struct pp_hwmgr *hwmgr) ret =psm_set_boot_states (hwmgr);if (ret)return ret; - ret =psm_adjust_power_state_dynamic (hwmgr, false,NULL ); + ret =psm_adjust_power_state_dynamic (hwmgr, true,NULL );if (ret)return ret; ret =phm_power_down_asic (hwmgr);
@@ -325,7 +325,7 @@ int hwmgr_resume(struct pp_hwmgr *hwmgr)if (ret)return ret; - ret =psm_adjust_power_state_dynamic (hwmgr, false,NULL ); + ret =psm_adjust_power_state_dynamic (hwmgr, true,NULL );return ret; }
@@ -379,12 +379,12 @@ int hwmgr_handle_task(struct pp_hwmgr *hwmgr, enum amd_pp_task task_id, ret =psm_set_user_performance_state (hwmgr, requested_ui_label, &requested_ps);if (ret)return ret; - ret =psm_adjust_power_state_dynamic (hwmgr, false, requested_ps); + ret =psm_adjust_power_state_dynamic (hwmgr, true, requested_ps);break ; }case AMD_PP_TASK_COMPLETE_INIT :case AMD_PP_TASK_READJUST_POWER_STATE : - ret =psm_adjust_power_state_dynamic (hwmgr, false,NULL ); + ret =psm_adjust_power_state_dynamic (hwmgr, true,NULL );break ;default :break ;
drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c +5 -6
@@ -256,16 +256,14 @@ static void power_state_management(struct pp_hwmgr *hwmgr, } } -int psm_adjust_power_state_dynamic (struct pp_hwmgr *hwmgr,bool skip, +int psm_adjust_power_state_dynamic (struct pp_hwmgr *hwmgr,bool skip_display_settings,struct pp_power_state *new_ps) {uint32_t index;long workload; -if (skip) -return 0 ; - -phm_display_configuration_changed (hwmgr); +if (!skip_display_settings) +phm_display_configuration_changed (hwmgr);if (hwmgr->ps)power_state_management (hwmgr, new_ps);
@@ -276,7 +274,8 @@ int psm_adjust_power_state_dynamic(struct pp_hwmgr *hwmgr, bool skip,*/ phm_apply_clock_adjust_rules (hwmgr); -phm_notify_smc_display_config_after_ps_adjustment (hwmgr); +if (!skip_display_settings) +phm_notify_smc_display_config_after_ps_adjustment (hwmgr);if ((hwmgr->request_dpm_level != hwmgr->dpm_level) && !phm_force_dpm_levels (hwmgr, hwmgr->request_dpm_level))
drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.h +1 -1
@@ -34,7 +34,7 @@ int psm_set_user_performance_state(struct pp_hwmgr *hwmgr,enum PP_StateUILabel label_id, struct pp_power_state **state);int psm_adjust_power_state_dynamic (struct pp_hwmgr *hwmgr, -bool skip, +bool skip_display_settings,struct pp_power_state *new_ps);#endif
Signature · 6 lines
2.20.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): [email protected]
Alex Deucher
Reviewed-byRe: [PATCH 2/2] drm/amd/powerplay: enforce display related settings only on needed
Quoted 107 lines · Evan Quan
No display related settings are needed on dpm level change.
Change-Id I86b32687a3bc14521be89dd4a3c9fb7de7f06c4bSigned-off-by Evan Quan <[email protected]>--- drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 10 +++++----- drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c | 11 +++++------ drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.h | 2 +- 3 files changed, 11 insertions(+), 12 deletions(-)drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c +5
-5@@ -273,7 +273,7 @@ int hwmgr_hw_fini(struct pp_hwmgr *hwmgr)phm_stop_thermal_controller (hwmgr);psm_set_boot_states (hwmgr); -psm_adjust_power_state_dynamic (hwmgr, false,NULL ); +psm_adjust_power_state_dynamic (hwmgr, true,NULL );phm_disable_dynamic_state_management (hwmgr);phm_disable_clock_power_gatings (hwmgr);@@ -295,7 +295,7 @@ int hwmgr_suspend(struct pp_hwmgr *hwmgr) ret =psm_set_boot_states (hwmgr);if (ret)return ret; - ret =psm_adjust_power_state_dynamic (hwmgr, false,NULL ); + ret =psm_adjust_power_state_dynamic (hwmgr, true,NULL );if (ret)return ret; ret =phm_power_down_asic (hwmgr);@@ -325,7 +325,7 @@ int hwmgr_resume(struct pp_hwmgr *hwmgr)if (ret)return ret; - ret =psm_adjust_power_state_dynamic (hwmgr, false,NULL ); + ret =psm_adjust_power_state_dynamic (hwmgr, true,NULL );return ret; }@@ -379,12 +379,12 @@ int hwmgr_handle_task(struct pp_hwmgr *hwmgr, enum amd_pp_task task_id, ret =psm_set_user_performance_state (hwmgr, requested_ui_label, &requested_ps);if (ret)return ret; - ret =psm_adjust_power_state_dynamic (hwmgr, false, requested_ps); + ret =psm_adjust_power_state_dynamic (hwmgr, true, requested_ps);break ; }case AMD_PP_TASK_COMPLETE_INIT :case AMD_PP_TASK_READJUST_POWER_STATE : - ret =psm_adjust_power_state_dynamic (hwmgr, false,NULL ); + ret =psm_adjust_power_state_dynamic (hwmgr, true,NULL );break ;default :break ;drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c +5
-6@@ -256,16 +256,14 @@ static void power_state_management(struct pp_hwmgr *hwmgr, } } -int psm_adjust_power_state_dynamic (struct pp_hwmgr *hwmgr,bool skip, +int psm_adjust_power_state_dynamic (struct pp_hwmgr *hwmgr,bool skip_display_settings,struct pp_power_state *new_ps) {uint32_t index;long workload; -if (skip) -return 0 ; - -phm_display_configuration_changed (hwmgr); +if (!skip_display_settings) +phm_display_configuration_changed (hwmgr);if (hwmgr->ps)power_state_management (hwmgr, new_ps);@@ -276,7 +274,8 @@ int psm_adjust_power_state_dynamic(struct pp_hwmgr *hwmgr, bool skip,*/ phm_apply_clock_adjust_rules (hwmgr); -phm_notify_smc_display_config_after_ps_adjustment (hwmgr); +if (!skip_display_settings) +phm_notify_smc_display_config_after_ps_adjustment (hwmgr);if ((hwmgr->request_dpm_level != hwmgr->dpm_level) && !phm_force_dpm_levels (hwmgr, hwmgr->request_dpm_level))drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.h +1
-2@@ -34,7 +34,7 @@ int psm_set_user_performance_state(struct pp_hwmgr *hwmgr,enum PP_StateUILabel label_id, struct pp_power_state **state);int psm_adjust_power_state_dynamic (struct pp_hwmgr *hwmgr, -bool skip, +bool skip_display_settings,struct pp_power_state *new_ps);#endif --2.20.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
Alex Deucher
Reviewed-byQuoted 6 lines · Evan Quan
No dpm level setting is needed when the request level is actually same as current.
Change-Id I3ffa0b111a7b37f78a6a4dc1a36d49f0496dd6f9Signed-off-by Evan Quan <[email protected]>
Quoted 21 lines
--- drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c +2
-2@@ -278,7 +278,8 @@ int psm_adjust_power_state_dynamic(struct pp_hwmgr *hwmgr, bool skip,phm_notify_smc_display_config_after_ps_adjustment (hwmgr); -if (!phm_force_dpm_levels (hwmgr, hwmgr->request_dpm_level)) +if ((hwmgr->request_dpm_level != hwmgr->dpm_level) && + !phm_force_dpm_levels (hwmgr, hwmgr->request_dpm_level)) hwmgr->dpm_level = hwmgr->request_dpm_level;if (hwmgr->dpm_level !=AMD_DPM_FORCED_LEVEL_MANUAL ) { --2.20.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