1 files changed, 45 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2065-drm-amd-amdgpu-Remove-workaround-check-for-UVD6-on-A.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2065-drm-amd-amdgpu-Remove-workaround-check-for-UVD6-on-A.patch
new file mode 100644
index 00000000..e0cf8cb8
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2065-drm-amd-amdgpu-Remove-workaround-check-for-UVD6-on-A.patch
@@ -0,0 +1,45 @@
+From c8d81cb7fde4073924163b445e87dfec0969bb80 Mon Sep 17 00:00:00 2001
+From: Tom St Denis <tom.stdenis@amd.com>
+Date: Mon, 23 Oct 2017 11:27:35 -0400
+Subject: [PATCH 2065/4131] drm/amd/amdgpu: Remove workaround check for UVD6 on
+ APUs
+
+On APUs the uvd6 driver was skipping proper suspend/resume routines resulting
+in a broken state upon resume.
+
+Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
+Acked-by: Alex Deucher <alexander.deucher@amd.com>
+Reviewed-by: Leo Liu <leo.liu@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 10 ----------
+ 1 file changed, 10 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
+index 246dfd7..58e400a 100644
+--- a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
+@@ -562,21 +562,11 @@ static int uvd_v6_0_hw_fini(void *handle)
+ 
+ static int uvd_v6_0_suspend(void *handle)
+ {
+-	int r;
+-	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+-
+-	r = uvd_v6_0_hw_fini(adev);
+-	if (r)
+-		return r;
+-
+ 	return amdgpu_uvd_suspend(adev);
+ }
+ 
+ static int uvd_v6_0_resume(void *handle)
+ {
+-	int r;
+-	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+-
+ 	r = amdgpu_uvd_resume(adev);
+ 	if (r)
+ 		return r;
+-- 
+2.7.4
+