1 files changed, 36 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2271-Revert-Revert-drm-amd-display-Release-cached-atomic-.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2271-Revert-Revert-drm-amd-display-Release-cached-atomic-.patch
new file mode 100644
index 00000000..736e09b0
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2271-Revert-Revert-drm-amd-display-Release-cached-atomic-.patch
@@ -0,0 +1,36 @@
+From f8acac11e1273ee12093a2c49d20694c95de1561 Mon Sep 17 00:00:00 2001
+From: "Le.Ma" <Le.Ma@amd.com>
+Date: Mon, 23 Oct 2017 16:02:30 +0800
+Subject: [PATCH 2271/4131] Revert "Revert "drm/amd/display: Release cached
+ atomic state in S3.""
+
+This reverts commit eef1b513a00a3a64ebc81f52c1bd9e6217a4dabf.
+---
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+index 89c4164..b284441 100644
+--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+@@ -550,6 +550,7 @@ static int dm_suspend(void *handle)
+ 
+ 	amdgpu_dm_irq_suspend(adev);
+ 
++	WARN_ON(adev->dm.cached_state);
+ 	adev->dm.cached_state = drm_atomic_helper_suspend(adev->ddev);
+ 
+ 	dc_set_power_state(
+@@ -649,6 +650,9 @@ int amdgpu_dm_display_resume(struct amdgpu_device *adev )
+ 
+ 	ret = drm_atomic_helper_resume(ddev, adev->dm.cached_state);
+ 
++	drm_atomic_state_put(adev->dm.cached_state);
++	adev->dm.cached_state = NULL;
++
+ 	amdgpu_dm_irq_resume_late(adev);
+ 
+ 	return ret;
+-- 
+2.7.4
+