diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/4030-drm-amdgpu-Fix-display-corruption-on-CI-with-dpm-ena.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/4030-drm-amdgpu-Fix-display-corruption-on-CI-with-dpm-ena.patch | 69 |
1 files changed, 69 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/4030-drm-amdgpu-Fix-display-corruption-on-CI-with-dpm-ena.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/4030-drm-amdgpu-Fix-display-corruption-on-CI-with-dpm-ena.patch new file mode 100644 index 00000000..220fcdfc --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/4030-drm-amdgpu-Fix-display-corruption-on-CI-with-dpm-ena.patch @@ -0,0 +1,69 @@ +From c846fc9a24a900332304265b31de904c80892983 Mon Sep 17 00:00:00 2001 +From: Rex Zhu <Rex.Zhu@amd.com> +Date: Fri, 27 Apr 2018 14:09:30 +0800 +Subject: [PATCH 4030/4131] drm/amdgpu: Fix display corruption on CI with dpm + enabled + +with dpm enabled, need to get active crtcs in dc/no-dc mode. + +caused by +'commit ebb649667a31 ("drm/amdgpu: Set pm_display_cfg in non-dc mode")' + +Reviewed-by: Huang Rui <ray.huang@amd.com> +Signed-off-by: Rex Zhu <Rex.Zhu@amd.com> +Signed-off-by: Mikita Lipski <mikita.lipski@amd.com> +Acked-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 32 ++++++++++++++++---------------- + 1 file changed, 16 insertions(+), 16 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +index 7d9aa8b..734d0bd 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +@@ -1711,26 +1711,26 @@ void amdgpu_pm_compute_clocks(struct amdgpu_device *adev) + amdgpu_fence_wait_empty(ring); + } + +- if (!amdgpu_device_has_dc_support(adev)) { +- mutex_lock(&adev->pm.mutex); +- amdgpu_dpm_get_active_displays(adev); +- adev->pm.pm_display_cfg.num_display = adev->pm.dpm.new_active_crtcs; +- adev->pm.pm_display_cfg.vrefresh = amdgpu_dpm_get_vrefresh(adev); +- adev->pm.pm_display_cfg.min_vblank_time = amdgpu_dpm_get_vblank_time(adev); +- /* we have issues with mclk switching with refresh rates over 120 hz on the non-DC code. */ +- if (adev->pm.pm_display_cfg.vrefresh > 120) +- adev->pm.pm_display_cfg.min_vblank_time = 0; +- if (adev->powerplay.pp_funcs->display_configuration_change) +- adev->powerplay.pp_funcs->display_configuration_change( +- adev->powerplay.pp_handle, +- &adev->pm.pm_display_cfg); +- mutex_unlock(&adev->pm.mutex); +- } +- + if (adev->powerplay.pp_funcs->dispatch_tasks) { ++ if (!amdgpu_device_has_dc_support(adev)) { ++ mutex_lock(&adev->pm.mutex); ++ amdgpu_dpm_get_active_displays(adev); ++ adev->pm.pm_display_cfg.num_display = adev->pm.dpm.new_active_crtcs; ++ adev->pm.pm_display_cfg.vrefresh = amdgpu_dpm_get_vrefresh(adev); ++ adev->pm.pm_display_cfg.min_vblank_time = amdgpu_dpm_get_vblank_time(adev); ++ /* we have issues with mclk switching with refresh rates over 120 hz on the non-DC code. */ ++ if (adev->pm.pm_display_cfg.vrefresh > 120) ++ adev->pm.pm_display_cfg.min_vblank_time = 0; ++ if (adev->powerplay.pp_funcs->display_configuration_change) ++ adev->powerplay.pp_funcs->display_configuration_change( ++ adev->powerplay.pp_handle, ++ &adev->pm.pm_display_cfg); ++ mutex_unlock(&adev->pm.mutex); ++ } + amdgpu_dpm_dispatch_task(adev, AMD_PP_TASK_DISPLAY_CONFIG_CHANGE, NULL); + } else { + mutex_lock(&adev->pm.mutex); ++ amdgpu_dpm_get_active_displays(adev); + /* update battery/ac status */ + if (power_supply_is_system_supplied() > 0) + adev->pm.dpm.ac_power = true; +-- +2.7.4 + |