1 files changed, 66 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/files/0298-drm-amdgpu-gfx7-Simplify-wptr-rptr-functions.patch b/common/recipes-kernel/linux/files/0298-drm-amdgpu-gfx7-Simplify-wptr-rptr-functions.patch
new file mode 100644
index 00000000..8af9cb30
--- /dev/null
+++ b/common/recipes-kernel/linux/files/0298-drm-amdgpu-gfx7-Simplify-wptr-rptr-functions.patch
@@ -0,0 +1,66 @@
+From d5c3076f344179387355e1efede457318c6a625a Mon Sep 17 00:00:00 2001
+From: Tom St Denis <tom.stdenis@amd.com>
+Date: Mon, 8 Feb 2016 12:47:58 -0500
+Subject: [PATCH 0298/1110] drm/amdgpu/gfx7: Simplify wptr/rptr functions
+
+Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
+Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 23 ++++-------------------
+ 1 file changed, 4 insertions(+), 19 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
+index 940dc0b..2cccd81 100644
+--- a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
+@@ -2652,21 +2652,14 @@ static int gfx_v7_0_cp_gfx_resume(struct amdgpu_device *adev)
+ 
+ static u32 gfx_v7_0_ring_get_rptr_gfx(struct amdgpu_ring *ring)
+ {
+-	u32 rptr;
+-
+-	rptr = ring->adev->wb.wb[ring->rptr_offs];
+-
+-	return rptr;
++	return ring->adev->wb.wb[ring->rptr_offs];
+ }
+ 
+ static u32 gfx_v7_0_ring_get_wptr_gfx(struct amdgpu_ring *ring)
+ {
+ 	struct amdgpu_device *adev = ring->adev;
+-	u32 wptr;
+ 
+-	wptr = RREG32(mmCP_RB0_WPTR);
+-
+-	return wptr;
++	return RREG32(mmCP_RB0_WPTR);
+ }
+ 
+ static void gfx_v7_0_ring_set_wptr_gfx(struct amdgpu_ring *ring)
+@@ -2679,21 +2672,13 @@ static void gfx_v7_0_ring_set_wptr_gfx(struct amdgpu_ring *ring)
+ 
+ static u32 gfx_v7_0_ring_get_rptr_compute(struct amdgpu_ring *ring)
+ {
+-	u32 rptr;
+-
+-	rptr = ring->adev->wb.wb[ring->rptr_offs];
+-
+-	return rptr;
++	return ring->adev->wb.wb[ring->rptr_offs];
+ }
+ 
+ static u32 gfx_v7_0_ring_get_wptr_compute(struct amdgpu_ring *ring)
+ {
+-	u32 wptr;
+-
+ 	/* XXX check if swapping is necessary on BE */
+-	wptr = ring->adev->wb.wb[ring->wptr_offs];
+-
+-	return wptr;
++	return ring->adev->wb.wb[ring->wptr_offs];
+ }
+ 
+ static void gfx_v7_0_ring_set_wptr_compute(struct amdgpu_ring *ring)
+-- 
+2.7.4
+