drm/amdgpu/powerplay: check vrefresh when when changing displays
Subsystems (2)
PATCH 1/1 drm/amdgpu/powerplay: check vrefresh when when changing displays
Compare the current vrefresh in addition to the number of displays when determining whether or not the smu needs updates when changing modes. The SMU needs to be updated if the vbi timeout changes due to a different refresh rate. Fixes flickering around mode changes in some cases on polaris parts.
--- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 3 +++ drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.h | 1 + drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 1 + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 3 ++- drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 1 + drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c | 1 + drivers/gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c | 1 + drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c | 1 + 8 files changed, 11 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +3 -0
@@ -4132,6 +4132,9 @@ smu7_check_smc_update_required_for_display_configuration(struct pp_hwmgr *hwmgr)if (data->display_timing.num_existing_displays != hwmgr->display_config->num_display) is_update_required = true; +if (data->display_timing.vrefresh != hwmgr->display_config->vrefresh) + is_update_required = true; +if (phm_cap_enabled (hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_SclkDeepSleep)) { if (data->display_timing.min_clock_in_sr != hwmgr->display_config->min_core_set_clock_in_sr && (data->display_timing.min_clock_in_sr >= SMU7_MINIMUM_ENGINE_CLOCK ||
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.h +1 -0
@@ -156,6 +156,7 @@ struct smu7_vbios_boot_state {struct smu7_display_timing {uint32_t min_clock_in_sr;uint32_t num_existing_displays; +uint32_t vrefresh; };struct smu7_dpmlevel_enable_mask {
drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c +1 -0
@@ -1231,6 +1231,7 @@ static int ci_populate_single_memory_level( memory_level->DisplayWatermark =PPSMC_DISPLAY_WATERMARK_LOW ; data->display_timing.num_existing_displays = hwmgr->display_config->num_display; + data->display_timing.vrefresh = hwmgr->display_config->vrefresh;/* stutter mode not support on ci */
drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c +2 -1
@@ -1210,7 +1210,8 @@ static int fiji_populate_single_memory_level(struct pp_hwmgr *hwmgr,* PECI_GetNumberOfActiveDisplays(hwmgr->pPECI, * &(data->DisplayTiming.numExistingDisplays)); */ - data->display_timing.num_existing_displays =1 ; + data->display_timing.num_existing_displays = hwmgr->display_config->num_display; + data->display_timing.vrefresh = hwmgr->display_config->vrefresh; if (mclk_stutter_mode_threshold && (clock <= mclk_stutter_mode_threshold) &&
drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c +1 -0
@@ -1280,6 +1280,7 @@ static int iceland_populate_single_memory_level( memory_level->DisplayWatermark =PPSMC_DISPLAY_WATERMARK_LOW ; data->display_timing.num_existing_displays = hwmgr->display_config->num_display; + data->display_timing.vrefresh = hwmgr->display_config->vrefresh;/* stutter mode not support on iceland */
drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c +1 -0
@@ -1103,6 +1103,7 @@ static int polaris10_populate_single_memory_level(struct pp_hwmgr *hwmgr, mem_level->DisplayWatermark =PPSMC_DISPLAY_WATERMARK_LOW ; data->display_timing.num_existing_displays = hwmgr->display_config->num_display; + data->display_timing.vrefresh = hwmgr->display_config->vrefresh; if (mclk_stutter_mode_threshold && (clock <= mclk_stutter_mode_threshold) &&
drivers/gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c +1 -0
@@ -1004,6 +1004,7 @@ static int tonga_populate_single_memory_level( memory_level->DisplayWatermark =PPSMC_DISPLAY_WATERMARK_LOW ; data->display_timing.num_existing_displays = hwmgr->display_config->num_display; + data->display_timing.vrefresh = hwmgr->display_config->vrefresh; if ((mclk_stutter_mode_threshold != 0) && (memory_clock <= mclk_stutter_mode_threshold) &&
drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c +1 -0
@@ -1009,6 +1009,7 @@ static int vegam_populate_single_memory_level(struct pp_hwmgr *hwmgr, mem_level->DisplayWatermark =PPSMC_DISPLAY_WATERMARK_LOW ; data->display_timing.num_existing_displays = hwmgr->display_config->num_display; + data->display_timing.vrefresh = hwmgr->display_config->vrefresh; if (mclk_stutter_mode_threshold && (clock <= mclk_stutter_mode_threshold) &&
Signature · 6 lines
2.13.6 _______________________________________________ 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): 20180809201623.3039-1-alexander.deucher-5C7GfCeVMHo@public.gmane.org
Patch is Reviewed-by: Rex Zhu <[email protected]>
Thanks.
Best Regards
Rex
________________________________
From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of Alex Deucher <[email protected]>
Sent: Friday, August 10, 2018 4:16:23 AM
To: [email protected]
Cc: Deucher, Alexander
Subject: [PATCH] drm/amdgpu/powerplay: check vrefresh when when changing displays
Compare the current vrefresh in addition to the number of displays when determining whether or not the smu needs updates when changing modes. The SMU needs to be updated if the vbi timeout changes due to a different refresh rate. Fixes flickering around mode changes in some cases on polaris parts.
--- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 3 +++ drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.h | 1 + drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 1 + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 3 ++- drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 1 + drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c | 1 + drivers/gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c | 1 + drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c | 1 + 8 files changed, 11 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +3 -0
@@ -4132,6 +4132,9 @@ smu7_check_smc_update_required_for_display_configuration(struct pp_hwmgr *hwmgr)if (data->display_timing.num_existing_displays != hwmgr->display_config->num_display) is_update_required = true; +if (data->display_timing.vrefresh != hwmgr->display_config->vrefresh) + is_update_required = true; +if (phm_cap_enabled (hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_SclkDeepSleep)) { if (data->display_timing.min_clock_in_sr != hwmgr->display_config->min_core_set_clock_in_sr && (data->display_timing.min_clock_in_sr >= SMU7_MINIMUM_ENGINE_CLOCK ||
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.h +1 -0
@@ -156,6 +156,7 @@ struct smu7_vbios_boot_state {struct smu7_display_timing {uint32_t min_clock_in_sr;uint32_t num_existing_displays; +uint32_t vrefresh; };struct smu7_dpmlevel_enable_mask {
drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c +1 -0
@@ -1231,6 +1231,7 @@ static int ci_populate_single_memory_level( memory_level->DisplayWatermark =PPSMC_DISPLAY_WATERMARK_LOW ; data->display_timing.num_existing_displays = hwmgr->display_config->num_display; + data->display_timing.vrefresh = hwmgr->display_config->vrefresh;/* stutter mode not support on ci */
drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c +2 -1
@@ -1210,7 +1210,8 @@ static int fiji_populate_single_memory_level(struct pp_hwmgr *hwmgr,* PECI_GetNumberOfActiveDisplays(hwmgr->pPECI, * &(data->DisplayTiming.numExistingDisplays)); */ - data->display_timing.num_existing_displays =1 ; + data->display_timing.num_existing_displays = hwmgr->display_config->num_display; + data->display_timing.vrefresh = hwmgr->display_config->vrefresh; if (mclk_stutter_mode_threshold && (clock <= mclk_stutter_mode_threshold) &&
drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c +1 -0
@@ -1280,6 +1280,7 @@ static int iceland_populate_single_memory_level( memory_level->DisplayWatermark =PPSMC_DISPLAY_WATERMARK_LOW ; data->display_timing.num_existing_displays = hwmgr->display_config->num_display; + data->display_timing.vrefresh = hwmgr->display_config->vrefresh;/* stutter mode not support on iceland */
drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c +1 -0
@@ -1103,6 +1103,7 @@ static int polaris10_populate_single_memory_level(struct pp_hwmgr *hwmgr, mem_level->DisplayWatermark =PPSMC_DISPLAY_WATERMARK_LOW ; data->display_timing.num_existing_displays = hwmgr->display_config->num_display; + data->display_timing.vrefresh = hwmgr->display_config->vrefresh; if (mclk_stutter_mode_threshold && (clock <= mclk_stutter_mode_threshold) &&
drivers/gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c +1 -0
@@ -1004,6 +1004,7 @@ static int tonga_populate_single_memory_level( memory_level->DisplayWatermark =PPSMC_DISPLAY_WATERMARK_LOW ; data->display_timing.num_existing_displays = hwmgr->display_config->num_display; + data->display_timing.vrefresh = hwmgr->display_config->vrefresh; if ((mclk_stutter_mode_threshold != 0) && (memory_clock <= mclk_stutter_mode_threshold) &&
drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c +1 -0
@@ -1009,6 +1009,7 @@ static int vegam_populate_single_memory_level(struct pp_hwmgr *hwmgr, mem_level->DisplayWatermark =PPSMC_DISPLAY_WATERMARK_LOW ; data->display_timing.num_existing_displays = hwmgr->display_config->num_display; + data->display_timing.vrefresh = hwmgr->display_config->vrefresh; if (mclk_stutter_mode_threshold && (clock <= mclk_stutter_mode_threshold) &&
--
2.13.6
_______________________________________________
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
Huang Rui
Reviewed-byQuoted 7 lines · Alex Deucher
Compare the current vrefresh in addition to the number of displays when determining whether or not the smu needs updates when changing modes. The SMU needs to be updated if the vbi timeout changes due to a different refresh rate. Fixes flickering around mode changes in some cases on polaris parts.
Signed-off-by Alex Deucher <[email protected]>
Quoted 118 lines
--- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 3 +++ drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.h | 1 + drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 1 + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 3 ++- drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 1 + drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c | 1 + drivers/gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c | 1 + drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c | 1 + 8 files changed, 11 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +3
-0@@ -4132,6 +4132,9 @@ smu7_check_smc_update_required_for_display_configuration(struct pp_hwmgr *hwmgr)if (data->display_timing.num_existing_displays != hwmgr->display_config->num_display) is_update_required = true; +if (data->display_timing.vrefresh != hwmgr->display_config->vrefresh) + is_update_required = true; +if (phm_cap_enabled (hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_SclkDeepSleep)) { if (data->display_timing.min_clock_in_sr != hwmgr->display_config->min_core_set_clock_in_sr && (data->display_timing.min_clock_in_sr >= SMU7_MINIMUM_ENGINE_CLOCK ||drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.h +1
-0@@ -156,6 +156,7 @@ struct smu7_vbios_boot_state {struct smu7_display_timing {uint32_t min_clock_in_sr;uint32_t num_existing_displays; +uint32_t vrefresh; };struct smu7_dpmlevel_enable_mask {drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c +1
-0@@ -1231,6 +1231,7 @@ static int ci_populate_single_memory_level( memory_level->DisplayWatermark =PPSMC_DISPLAY_WATERMARK_LOW ; data->display_timing.num_existing_displays = hwmgr->display_config->num_display; + data->display_timing.vrefresh = hwmgr->display_config->vrefresh;/* stutter mode not support on ci */ drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c +2
-1@@ -1210,7 +1210,8 @@ static int fiji_populate_single_memory_level(struct pp_hwmgr *hwmgr,* PECI_GetNumberOfActiveDisplays(hwmgr->pPECI, * &(data->DisplayTiming.numExistingDisplays)); */ - data->display_timing.num_existing_displays =1 ; + data->display_timing.num_existing_displays = hwmgr->display_config->num_display; + data->display_timing.vrefresh = hwmgr->display_config->vrefresh; if (mclk_stutter_mode_threshold && (clock <= mclk_stutter_mode_threshold) &&drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c +1
-0@@ -1280,6 +1280,7 @@ static int iceland_populate_single_memory_level( memory_level->DisplayWatermark =PPSMC_DISPLAY_WATERMARK_LOW ; data->display_timing.num_existing_displays = hwmgr->display_config->num_display; + data->display_timing.vrefresh = hwmgr->display_config->vrefresh;/* stutter mode not support on iceland */ drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c +1
-0@@ -1103,6 +1103,7 @@ static int polaris10_populate_single_memory_level(struct pp_hwmgr *hwmgr, mem_level->DisplayWatermark =PPSMC_DISPLAY_WATERMARK_LOW ; data->display_timing.num_existing_displays = hwmgr->display_config->num_display; + data->display_timing.vrefresh = hwmgr->display_config->vrefresh; if (mclk_stutter_mode_threshold && (clock <= mclk_stutter_mode_threshold) &&drivers/gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c +1
-0@@ -1004,6 +1004,7 @@ static int tonga_populate_single_memory_level( memory_level->DisplayWatermark =PPSMC_DISPLAY_WATERMARK_LOW ; data->display_timing.num_existing_displays = hwmgr->display_config->num_display; + data->display_timing.vrefresh = hwmgr->display_config->vrefresh; if ((mclk_stutter_mode_threshold != 0) && (memory_clock <= mclk_stutter_mode_threshold) &&drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c +1
-0@@ -1009,6 +1009,7 @@ static int vegam_populate_single_memory_level(struct pp_hwmgr *hwmgr, mem_level->DisplayWatermark =PPSMC_DISPLAY_WATERMARK_LOW ; data->display_timing.num_existing_displays = hwmgr->display_config->num_display; + data->display_timing.vrefresh = hwmgr->display_config->vrefresh; if (mclk_stutter_mode_threshold && (clock <= mclk_stutter_mode_threshold) &&Signature · 6 lines
2.13.6 _______________________________________________ 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