1 files changed, 43 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2955-drm-amdgpu-drop-scratch-regs-save-and-restore-from-S.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2955-drm-amdgpu-drop-scratch-regs-save-and-restore-from-S.patch
new file mode 100644
index 00000000..e479be95
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2955-drm-amdgpu-drop-scratch-regs-save-and-restore-from-S.patch
@@ -0,0 +1,43 @@
+From 494d63cf945925d2d311fcf5585ba136ef83860e Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexander.deucher@amd.com>
+Date: Tue, 12 Dec 2017 15:20:22 -0500
+Subject: [PATCH 2955/4131] drm/amdgpu: drop scratch regs save and restore from
+ S3/S4 handling
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The expectation is that the base driver doesn't mess with these.
+Some components interact with these directly so let the components
+handle these directly.
+
+Reviewed-by: Harry Wentland <harry.wentland@amd.com>
+Acked-by: Christian König <christian.koenig@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+index aa61b02..fa4e445 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+@@ -2606,7 +2606,6 @@ int amdgpu_device_suspend(struct drm_device *dev, bool suspend, bool fbcon)
+ 	 */
+ 	amdgpu_bo_evict_vram(adev);
+ 
+-	amdgpu_atombios_scratch_regs_save(adev);
+ 	pci_save_state(dev->pdev);
+ 	if (suspend) {
+ 		/* Shut down the device */
+@@ -2655,7 +2654,6 @@ int amdgpu_device_resume(struct drm_device *dev, bool resume, bool fbcon)
+ 		if (r)
+ 			goto unlock;
+ 	}
+-	amdgpu_atombios_scratch_regs_restore(adev);
+ 
+ 	/* post card */
+ 	if (amdgpu_need_post(adev)) {
+-- 
+2.7.4
+