aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
diff options
context:
space:
mode:
authorRex Zhu <Rex.Zhu@amd.com>2017-03-30 01:21:01 -0400
committerAlex Deucher <alexander.deucher@amd.com>2017-04-04 13:40:32 -0400
commite6707218f77bc850f41720dc70d3d4a0dce9ef4a (patch)
tree42e8acd5d77c703569f807ab21b59be7b670450d /drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
parenta9f87f6452543505108d7d9b36d948534ea28b0b (diff)
drm/amdgpu: when resume failed, return error to avoid system hang.
Continuing if the GPU fails to resume will end in pain. Signed-off-by: Rex Zhu <Rex.Zhu@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_device.c5
1 files 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 83dda05325b8..4aa10d7baf43 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -2249,9 +2249,10 @@ int amdgpu_device_resume(struct drm_device *dev, bool resume, bool fbcon)
2249 } 2249 }
2250 2250
2251 r = amdgpu_resume(adev); 2251 r = amdgpu_resume(adev);
2252 if (r) 2252 if (r) {
2253 DRM_ERROR("amdgpu_resume failed (%d).\n", r); 2253 DRM_ERROR("amdgpu_resume failed (%d).\n", r);
2254 2254 return r;
2255 }
2255 amdgpu_fence_driver_resume(adev); 2256 amdgpu_fence_driver_resume(adev);
2256 2257
2257 if (resume) { 2258 if (resume) {