blob: f82334c50fb2861b46426acb53f48fb4a6dec3c9 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
|
From af57c34afa0ab1c35877e8a3f0ab96e58b28b4af Mon Sep 17 00:00:00 2001
From: Chunming Zhou <David1.Zhou@amd.com>
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 <David1.Zhou@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Kalyan Alle <kalyan.alle@amd.com>
---
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
|
