1 files changed, 46 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1872-drm-amdgpu-fix-uvd-ring-fini-routine-v2.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1872-drm-amdgpu-fix-uvd-ring-fini-routine-v2.patch
new file mode 100644
index 00000000..1c761e2d
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1872-drm-amdgpu-fix-uvd-ring-fini-routine-v2.patch
@@ -0,0 +1,46 @@
+From 6b2cbf11de1f44813d729707d50b314f70ee0ac0 Mon Sep 17 00:00:00 2001
+From: Monk Liu <Monk.Liu@amd.com>
+Date: Fri, 15 Sep 2017 16:43:01 +0800
+Subject: [PATCH 1872/4131] drm/amdgpu:fix uvd ring fini routine(v2)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+fix missing finish uvd enc_ring.
+v2:
+since the adev pointer check in already in ring_fini
+so drop the check outsider
+
+Change-Id: Ib74237ca5adcb3b128c9b751fced0b7db7b09e86
+Signed-off-by: Monk Liu <Monk.Liu@amd.com>
+Reviewed-by: Christian König <christian.koenig@amd.com>
+Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
+index 2a01a64..9df2a8c 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
+@@ -269,6 +269,7 @@ int amdgpu_uvd_sw_init(struct amdgpu_device *adev)
+ 
+ int amdgpu_uvd_sw_fini(struct amdgpu_device *adev)
+ {
++	int i;
+ 	kfree(adev->uvd.saved_bo);
+ 
+ 	amd_sched_entity_fini(&adev->uvd.ring.sched, &adev->uvd.entity);
+@@ -279,6 +280,9 @@ int amdgpu_uvd_sw_fini(struct amdgpu_device *adev)
+ 
+ 	amdgpu_ring_fini(&adev->uvd.ring);
+ 
++	for (i = 0; i < AMDGPU_MAX_UVD_ENC_RINGS; ++i)
++		amdgpu_ring_fini(&adev->uvd.ring_enc[i]);
++
+ 	release_firmware(adev->uvd.fw);
+ 
+ 	return 0;
+-- 
+2.7.4
+