From 7b3e0b129a4a2fcfef573063ecf6c70d642d3b5f Mon Sep 17 00:00:00 2001 From: Chunming Zhou Date: Fri, 17 Jun 2016 11:00:15 +0800 Subject: [PATCH 1105/1110] drm/amdgpu: add dm_display_resume to balance dm_suspend Change-Id: I5ed30c7c8294c3a78a250160f06e21cf0f1d9004 Signed-off-by: Chunming Zhou Acked-by: Alex Deucher Signed-off-by: Kalyan Alle --- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index e03d215..5f43c3e 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -1969,9 +1969,10 @@ retry: } } - if (amdgpu_device_has_dal_support(adev)) + if (amdgpu_device_has_dal_support(adev)) { r = drm_atomic_helper_resume(adev->ddev, state); - else + amdgpu_dm_display_resume(adev); + } else drm_helper_resume_force_mode(adev->ddev); ttm_bo_unlock_delayed_workqueue(&adev->mman.bdev, resched); -- 2.7.4