1 files changed, 82 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/files/0268-drm-amdgpu-gfx-minor-code-cleanup.patch b/common/recipes-kernel/linux/files/0268-drm-amdgpu-gfx-minor-code-cleanup.patch
new file mode 100644
index 00000000..c713bace
--- /dev/null
+++ b/common/recipes-kernel/linux/files/0268-drm-amdgpu-gfx-minor-code-cleanup.patch
@@ -0,0 +1,82 @@
+From f7e14e1fbbcb72b09138da32ffe61b9b7d5f61a7 Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexander.deucher@amd.com>
+Date: Thu, 4 Feb 2016 11:11:00 -0500
+Subject: [PATCH 0268/1110] drm/amdgpu/gfx: minor code cleanup
+
+Drop needless function wrapper.
+
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 19 +------------------
+ drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 11 +----------
+ 2 files changed, 2 insertions(+), 28 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
+index bf0517d..e4a78ff 100644
+--- a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
+@@ -3096,21 +3096,6 @@ static int gfx_v7_0_cp_compute_load_microcode(struct amdgpu_device *adev)
+ }
+ 
+ /**
+- * gfx_v7_0_cp_compute_start - start the compute queues
+- *
+- * @adev: amdgpu_device pointer
+- *
+- * Enable the compute queues.
+- * Returns 0 for success, error for failure.
+- */
+-static int gfx_v7_0_cp_compute_start(struct amdgpu_device *adev)
+-{
+-	gfx_v7_0_cp_compute_enable(adev, true);
+-
+-	return 0;
+-}
+-
+-/**
+  * gfx_v7_0_cp_compute_fini - stop the compute queues
+  *
+  * @adev: amdgpu_device pointer
+@@ -3300,9 +3285,7 @@ static int gfx_v7_0_cp_compute_resume(struct amdgpu_device *adev)
+ 	u32 *buf;
+ 	struct bonaire_mqd *mqd;
+ 
+-	r = gfx_v7_0_cp_compute_start(adev);
+-	if (r)
+-		return r;
++	gfx_v7_0_cp_compute_enable(adev, true);
+ 
+ 	/* fix up chicken bits */
+ 	tmp = RREG32(mmCP_CPF_DEBUG);
+diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
+index 3a2b060..ab1159e 100644
+--- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
+@@ -3226,13 +3226,6 @@ static void gfx_v8_0_cp_compute_enable(struct amdgpu_device *adev, bool enable)
+ 	udelay(50);
+ }
+ 
+-static int gfx_v8_0_cp_compute_start(struct amdgpu_device *adev)
+-{
+-	gfx_v8_0_cp_compute_enable(adev, true);
+-
+-	return 0;
+-}
+-
+ static int gfx_v8_0_cp_compute_load_microcode(struct amdgpu_device *adev)
+ {
+ 	const struct gfx_firmware_header_v1_0 *mec_hdr;
+@@ -3802,9 +3795,7 @@ static int gfx_v8_0_cp_compute_resume(struct amdgpu_device *adev)
+ 		WREG32(mmCP_PQ_STATUS, tmp);
+ 	}
+ 
+-	r = gfx_v8_0_cp_compute_start(adev);
+-	if (r)
+-		return r;
++	gfx_v8_0_cp_compute_enable(adev, true);
+ 
+ 	for (i = 0; i < adev->gfx.num_compute_rings; i++) {
+ 		struct amdgpu_ring *ring = &adev->gfx.compute_ring[i];
+-- 
+2.7.4
+