1 files changed, 51 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2214-drm-amdgpu-cancel-timer-of-virtual-DCE-v2.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2214-drm-amdgpu-cancel-timer-of-virtual-DCE-v2.patch
new file mode 100644
index 00000000..2ce5e67a
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2214-drm-amdgpu-cancel-timer-of-virtual-DCE-v2.patch
@@ -0,0 +1,51 @@
+From 7d1818d0793a0aff46332fc7440c9c597d27d4e1 Mon Sep 17 00:00:00 2001
+From: Monk Liu <Monk.Liu@amd.com>
+Date: Thu, 16 Nov 2017 11:11:39 +0800
+Subject: [PATCH 2214/4131] drm/amdgpu:cancel timer of virtual DCE(v2)
+
+virtual DCE Timer structure is already released
+after its sw_fini(), so we need to cancel the
+its Timer in hw_fini() otherwise the Timer canceling
+is missed.
+
+v2:
+use for loop and num_crtc to replace original code
+
+Change-Id: I03d6ca7aa07591d287da379ef4fe008f06edaff6
+Signed-off-by: Monk Liu <Monk.Liu@amd.com>
+Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
+index f3f93b6..f111bae 100644
+--- a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
++++ b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
+@@ -44,6 +44,9 @@ static void dce_virtual_set_display_funcs(struct amdgpu_device *adev);
+ static void dce_virtual_set_irq_funcs(struct amdgpu_device *adev);
+ static int dce_virtual_connector_encoder_init(struct amdgpu_device *adev,
+ 					      int index);
++static void dce_virtual_set_crtc_vblank_interrupt_state(struct amdgpu_device *adev,
++							int crtc,
++							enum amdgpu_interrupt_state state);
+ 
+ /**
+  * dce_virtual_vblank_wait - vblank wait asic callback.
+@@ -491,6 +494,13 @@ static int dce_virtual_hw_init(void *handle)
+ 
+ static int dce_virtual_hw_fini(void *handle)
+ {
++	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
++	int i = 0;
++
++	for (i = 0; i<adev->mode_info.num_crtc; i++)
++		if (adev->mode_info.crtcs[i])
++			dce_virtual_set_crtc_vblank_interrupt_state(adev, i, AMDGPU_IRQ_STATE_DISABLE);
++
+ 	return 0;
+ }
+ 
+-- 
+2.7.4
+