drm/amdgpu: when resume failed, return error to avoid system hang.
authorRex Zhu <Rex.Zhu@amd.com>
Thu, 30 Mar 2017 05:21:01 +0000 (13:21 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 4 Apr 2017 17:40:32 +0000 (13:40 -0400)
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>
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

index 83dda05325b856312d5aa6e3134dff57167ef24b..4aa10d7baf43de4570b002f237d5fbc82950405e 100644 (file)
@@ -2249,9 +2249,10 @@ int amdgpu_device_resume(struct drm_device *dev, bool resume, bool fbcon)
        }
 
        r = amdgpu_resume(adev);
-       if (r)
+       if (r) {
                DRM_ERROR("amdgpu_resume failed (%d).\n", r);
-
+               return r;
+       }
        amdgpu_fence_driver_resume(adev);
 
        if (resume) {