1 files changed, 88 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2972-drm-amdgpu-rename-amdgpu_suspend-to-amdgpu_device_ip.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2972-drm-amdgpu-rename-amdgpu_suspend-to-amdgpu_device_ip.patch
new file mode 100644
index 00000000..6186db99
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2972-drm-amdgpu-rename-amdgpu_suspend-to-amdgpu_device_ip.patch
@@ -0,0 +1,88 @@
+From 4ecdfc6f96e14c57e63c4461bfef65ceecfb9e18 Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexander.deucher@amd.com>
+Date: Thu, 14 Dec 2017 16:47:40 -0500
+Subject: [PATCH 2972/4131] drm/amdgpu: rename amdgpu_suspend to
+ amdgpu_device_ip_suspend
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+for consistency with the other functions in that file.
+
+Acked-by: Christian König <christian.koenig@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu.h        | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 8 ++++----
+ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c    | 2 +-
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+index 46e72fa..f71e6e7 100755
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+@@ -2039,7 +2039,7 @@ void amdgpu_driver_lastclose_kms(struct drm_device *dev);
+ int amdgpu_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv);
+ void amdgpu_driver_postclose_kms(struct drm_device *dev,
+ 				 struct drm_file *file_priv);
+-int amdgpu_suspend(struct amdgpu_device *adev);
++int amdgpu_device_ip_suspend(struct amdgpu_device *adev);
+ int amdgpu_device_suspend(struct drm_device *dev, bool suspend, bool fbcon);
+ int amdgpu_device_resume(struct drm_device *dev, bool resume, bool fbcon);
+ u32 amdgpu_get_vblank_counter_kms(struct drm_device *dev, unsigned int pipe);
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+index f0f1b16..1eceb1c 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+@@ -1722,7 +1722,7 @@ static void amdgpu_device_ip_late_init_func_handler(struct work_struct *work)
+ 	amdgpu_device_ip_late_set_cg_state(adev);
+ }
+ 
+-int amdgpu_suspend(struct amdgpu_device *adev)
++int amdgpu_device_ip_suspend(struct amdgpu_device *adev)
+ {
+ 	int i, r;
+ 
+@@ -2373,7 +2373,7 @@ int amdgpu_device_suspend(struct drm_device *dev, bool suspend, bool fbcon)
+ 
+ 	amdgpu_fence_driver_suspend(adev);
+ 
+-	r = amdgpu_suspend(adev);
++	r = amdgpu_device_ip_suspend(adev);
+ 
+ 	/* evict remaining vram memory
+ 	 * This second call to evict vram is to evict the gart page table
+@@ -2699,7 +2699,7 @@ static int amdgpu_device_reset(struct amdgpu_device *adev,
+         }
+ 
+         if (need_full_reset) {
+-                r = amdgpu_suspend(adev);
++		r = amdgpu_device_ip_suspend(adev);
+ 
+ retry:
+                 r = amdgpu_asic_reset(adev);
+@@ -2738,7 +2738,7 @@ static int amdgpu_device_reset(struct amdgpu_device *adev,
+                 r = amdgpu_ib_ring_tests(adev);
+                 if (r) {
+                         dev_err(adev->dev, "ib ring test failed (%d).\n", r);
+-                        r = amdgpu_suspend(adev);
++			r = amdgpu_device_ip_suspend(adev);
+                         need_full_reset = true;
+                         goto retry;
+                 }
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+index c4ec022..b7a9f74 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+@@ -635,7 +635,7 @@ amdgpu_pci_shutdown(struct pci_dev *pdev)
+ 	 * unfortunately we can't detect certain
+ 	 * hypervisors so just do this all the time.
+ 	 */
+-	amdgpu_suspend(adev);
++	amdgpu_device_ip_suspend(adev);
+ }
+ 
+ static int amdgpu_pmops_suspend(struct device *dev)
+-- 
+2.7.4
+