From c566112f9c9f49171276f91bcb1eff49129ddfeb Mon Sep 17 00:00:00 2001 From: Evan Quan 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 Reported-by: Huang Rui Acked-by: Huang Rui Reviewed-by: Yong Zhao --- 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