1 files changed, 53 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2066-drm-amd-amdgpu-Remove-workaround-for-suspend-resume-.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2066-drm-amd-amdgpu-Remove-workaround-for-suspend-resume-.patch
new file mode 100644
index 00000000..c326e928
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2066-drm-amd-amdgpu-Remove-workaround-for-suspend-resume-.patch
@@ -0,0 +1,53 @@
+From d7ddf2c28f3ddd889972afeb46e575bc5526b3c5 Mon Sep 17 00:00:00 2001
+From: Tom St Denis <tom.stdenis@amd.com>
+Date: Tue, 24 Oct 2017 12:07:12 -0400
+Subject: [PATCH 2066/4131] drm/amd/amdgpu: Remove workaround for
+ suspend/resume in uvd7
+
+The workaround is not required anymor and would result in
+hangs during suspend/resume cycles if the uvd block were busy.
+
+Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
+Acked-by: Leo Liu <leo.liu@amd.com>
+Acked-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 16 +++++-----------
+ 1 file changed, 5 insertions(+), 11 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
+index 8dbb409..762ff39 100644
+--- a/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
+@@ -592,11 +592,7 @@ static int uvd_v7_0_suspend(void *handle)
+ 	if (r)
+ 		return r;
+ 
+-	/* Skip this for APU for now */
+-	if (!(adev->flags & AMD_IS_APU))
+-		r = amdgpu_uvd_suspend(adev);
+-
+-	return r;
++	return amdgpu_uvd_suspend(adev);
+ }
+ 
+ static int uvd_v7_0_resume(void *handle)
+@@ -604,12 +600,10 @@ static int uvd_v7_0_resume(void *handle)
+ 	int r;
+ 	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+ 
+-	/* Skip this for APU for now */
+-	if (!(adev->flags & AMD_IS_APU)) {
+-		r = amdgpu_uvd_resume(adev);
+-		if (r)
+-			return r;
+-	}
++	r = amdgpu_uvd_resume(adev);
++	if (r)
++		return r;
++
+ 	return uvd_v7_0_hw_init(adev);
+ }
+ 
+-- 
+2.7.4
+