From af57c34afa0ab1c35877e8a3f0ab96e58b28b4af Mon Sep 17 00:00:00 2001 From: Chunming Zhou Date: Mon, 6 Jun 2016 14:19:02 +0800 Subject: [PATCH 1100/1110] drm/amdgpu: drm_helper_resume_force_mode is only working for non-DAL driver Change-Id: I6c9210a37a43585065d5f8de7814f89717f87bc9 Signed-off-by: Chunming Zhou Reviewed-by: Alex Deucher Signed-off-by: Kalyan Alle --- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 699ea3f..a92189a 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -1964,7 +1964,11 @@ retry: } } - drm_helper_resume_force_mode(adev->ddev); + if (amdgpu_device_has_dal_support(adev)) + /* TODO needed from DAL, otherwise the mode cannot be back */ + ; + else + drm_helper_resume_force_mode(adev->ddev); ttm_bo_unlock_delayed_workqueue(&adev->mman.bdev, resched); if (r) { -- 2.7.4