diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3542-drm-amdgpu-Unify-the-dm-resume-calls-into-one.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3542-drm-amdgpu-Unify-the-dm-resume-calls-into-one.patch | 74 |
1 files changed, 74 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3542-drm-amdgpu-Unify-the-dm-resume-calls-into-one.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3542-drm-amdgpu-Unify-the-dm-resume-calls-into-one.patch new file mode 100644 index 00000000..7f7f4994 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3542-drm-amdgpu-Unify-the-dm-resume-calls-into-one.patch @@ -0,0 +1,74 @@ +From cf3a5a663a5786f53a1d3b70990206a69592c749 Mon Sep 17 00:00:00 2001 +From: Mikita Lipski <mikita.lipski@amd.com> +Date: Sat, 3 Feb 2018 15:19:20 -0500 +Subject: [PATCH 3542/4131] drm/amdgpu: Unify the dm resume calls into one + +amdgpu_dm_display_resume is now called from dm_resume to +unify DAL resume call into a single function call + +There is no more need to separately call 2 resume functions +for DM. + +Initially they were separated to resume display state after +cursor is pinned. But because there is no longer any corruption +with the cursor - the calls can be merged into one function hook. + +Signed-off-by: Mikita Lipski <mikita.lipski@amd.com> +Reviewed-by: Harry Wentland <harry.wentland@amd.com> +Reviewed-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +Signed-off-by: Kalyan Alle <kalyan.alle@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 9 --------- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +++- + 2 files changed, 3 insertions(+), 10 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +index 0502731..e319c96 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +@@ -2333,14 +2333,6 @@ int amdgpu_device_resume(struct drm_device *dev, bool resume, bool fbcon) + drm_helper_connector_dpms(connector, DRM_MODE_DPMS_ON); + } + drm_modeset_unlock_all(dev); +- } else { +- /* +- * There is no equivalent atomic helper to turn on +- * display, so we defined our own function for this, +- * once suspend resume is supported by the atomic +- * framework this will be reworked +- */ +- amdgpu_dm_display_resume(adev); + } + } + +@@ -2778,7 +2770,6 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev, + if (amdgpu_device_has_dc_support(adev)) { + if (drm_atomic_helper_resume(adev->ddev, state)) + dev_info(adev->dev, "drm resume failed:%d\n", r); +- amdgpu_dm_display_resume(adev); + } else { + drm_helper_resume_force_mode(adev->ddev); + } +diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +index 8403f7b..0191634 100644 +--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c ++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +@@ -660,11 +660,13 @@ static int dm_resume(void *handle) + { + struct amdgpu_device *adev = handle; + struct amdgpu_display_manager *dm = &adev->dm; ++ int ret = 0; + + /* power on hardware */ + dc_set_power_state(dm->dc, DC_ACPI_CM_POWER_STATE_D0); + +- return 0; ++ ret = amdgpu_dm_display_resume(adev); ++ return ret; + } + + int amdgpu_dm_display_resume(struct amdgpu_device *adev) +-- +2.7.4 + |