blob: f150e33cefd3609f14a465fee552802598ecba11 (
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
|
From c566112f9c9f49171276f91bcb1eff49129ddfeb Mon Sep 17 00:00:00 2001
From: Evan Quan <evan.quan@amd.com>
Date: Thu, 4 May 2017 13:57:49 +0800
Subject: [PATCH 1683/4131] drm/amdkfd: avoid deadlock on resume from S3
Change-Id: If62f8117a8f7157c056d7b4332c710d068391162
Signed-off-by: Evan Quan <evan.quan@amd.com>
Reported-by: Huang Rui <ray.huang@amd.com>
Acked-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Yong Zhao <yong.zhao@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 37398e3..b84914c 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -2536,7 +2536,7 @@ int amdgpu_device_resume(struct drm_device *dev, bool resume, bool fbcon)
}
r = amdgpu_amdkfd_resume(adev);
if (r)
- return r;
+ goto unlock;
/* blat the mode back in */
if (fbcon) {
--
2.7.4
|
