diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1683-drm-amdkfd-avoid-deadlock-on-resume-from-S3.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1683-drm-amdkfd-avoid-deadlock-on-resume-from-S3.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1683-drm-amdkfd-avoid-deadlock-on-resume-from-S3.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1683-drm-amdkfd-avoid-deadlock-on-resume-from-S3.patch new file mode 100644 index 00000000..f150e33c --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1683-drm-amdkfd-avoid-deadlock-on-resume-from-S3.patch @@ -0,0 +1,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 + |