drm/amd/powerplay: fix possible hang with 3+ 4K monitors
Subsystems (2)
PATCH 1/1 drm/amd/powerplay: fix possible hang with 3+ 4K monitors
If DAL requires to force MCLK high, the FCLK will be forced to high also.
--- drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +9 -1
@@ -3471,6 +3471,7 @@ static int vega20_apply_clocks_adjust_rules(struct pp_hwmgr *hwmgr)struct vega20_single_dpm_table *dpm_table;bool vblank_too_short = false;bool disable_mclk_switching; +bool disable_fclk_switching;uint32_t i, latency; disable_mclk_switching = ((1 < hwmgr->display_config->num_display) &&
@@ -3546,13 +3547,20 @@ static int vega20_apply_clocks_adjust_rules(struct pp_hwmgr *hwmgr)if (hwmgr->display_config->nb_pstate_switch_disable) dpm_table->dpm_state.hard_min_level = dpm_table->dpm_levels[dpm_table->count -1 ].value; +if ((disable_mclk_switching && + (dpm_table->dpm_state.hard_min_level == dpm_table->dpm_levels[dpm_table->count -1 ].value)) || + hwmgr->display_config->min_mem_set_clock /100 >= dpm_table->dpm_levels[dpm_table->count -1 ].value) + disable_fclk_switching = true; +else + disable_fclk_switching = false; +/* fclk */ dpm_table = &(data->dpm_table.fclk_table); dpm_table->dpm_state.soft_min_level = dpm_table->dpm_levels[0 ].value; dpm_table->dpm_state.soft_max_level =VG20_CLOCK_MAX_DEFAULT ; dpm_table->dpm_state.hard_min_level = dpm_table->dpm_levels[0 ].value; dpm_table->dpm_state.hard_max_level =VG20_CLOCK_MAX_DEFAULT ; -if (hwmgr->display_config->nb_pstate_switch_disable) +if (hwmgr->display_config->nb_pstate_switch_disable || disable_fclk_switching) dpm_table->dpm_state.soft_min_level = dpm_table->dpm_levels[dpm_table->count -1 ].value;/* vclk */
Signature · 6 lines
2.21.0 _______________________________________________ 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]
Deucher, Alexander
Acked-by________________________________
From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of Evan Quan <[email protected]>
Sent: Tuesday, March 26, 2019 6:13 AM
To: [email protected]
Cc: Quan, Evan
Subject: [PATCH] drm/amd/powerplay: fix possible hang with 3+ 4K monitors
If DAL requires to force MCLK high, the FCLK will be forced to high also.
--- drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +9 -1
@@ -3471,6 +3471,7 @@ static int vega20_apply_clocks_adjust_rules(struct pp_hwmgr *hwmgr)struct vega20_single_dpm_table *dpm_table;bool vblank_too_short = false;bool disable_mclk_switching; +bool disable_fclk_switching;uint32_t i, latency; disable_mclk_switching = ((1 < hwmgr->display_config->num_display) &&
@@ -3546,13 +3547,20 @@ static int vega20_apply_clocks_adjust_rules(struct pp_hwmgr *hwmgr)if (hwmgr->display_config->nb_pstate_switch_disable) dpm_table->dpm_state.hard_min_level = dpm_table->dpm_levels[dpm_table->count -1 ].value; +if ((disable_mclk_switching && + (dpm_table->dpm_state.hard_min_level == dpm_table->dpm_levels[dpm_table->count -1 ].value)) || + hwmgr->display_config->min_mem_set_clock /100 >= dpm_table->dpm_levels[dpm_table->count -1 ].value) + disable_fclk_switching = true; +else + disable_fclk_switching = false; +/* fclk */ dpm_table = &(data->dpm_table.fclk_table); dpm_table->dpm_state.soft_min_level = dpm_table->dpm_levels[0 ].value; dpm_table->dpm_state.soft_max_level =VG20_CLOCK_MAX_DEFAULT ; dpm_table->dpm_state.hard_min_level = dpm_table->dpm_levels[0 ].value; dpm_table->dpm_state.hard_max_level =VG20_CLOCK_MAX_DEFAULT ; -if (hwmgr->display_config->nb_pstate_switch_disable) +if (hwmgr->display_config->nb_pstate_switch_disable || disable_fclk_switching) dpm_table->dpm_state.soft_min_level = dpm_table->dpm_levels[dpm_table->count -1 ].value;/* vclk */
--
2.21.0
_______________________________________________
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