1 files changed, 37 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2956-drm-amdgpu-drop-scratch-regs-save-and-restore-from-G.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2956-drm-amdgpu-drop-scratch-regs-save-and-restore-from-G.patch
new file mode 100644
index 00000000..72e53ff5
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2956-drm-amdgpu-drop-scratch-regs-save-and-restore-from-G.patch
@@ -0,0 +1,37 @@
+From 6f4411e541c6c8b760ac9e54164f8f26f25d0bf3 Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexander.deucher@amd.com>
+Date: Tue, 12 Dec 2017 15:22:56 -0500
+Subject: [PATCH 2956/4131] drm/amdgpu: drop scratch regs save and restore from
+ GPU reset 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 fa4e445..3866998 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+@@ -2926,9 +2926,7 @@ static int amdgpu_reset(struct amdgpu_device *adev, uint64_t* reset_flags)
+                 r = amdgpu_suspend(adev);
+ 
+ retry:
+-                amdgpu_atombios_scratch_regs_save(adev);
+                 r = amdgpu_asic_reset(adev);
+-                amdgpu_atombios_scratch_regs_restore(adev);
+                 /* post card */
+                 amdgpu_atom_asic_init(adev->mode_info.atom_context);
+ 
+-- 
+2.7.4
+