drm/amd/amdgpu: Merge get_rptr functions in gfx6
Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
index f430d6a..d090f26 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
@@ -1655,7 +1655,7 @@
return 0;
}
-static u32 gfx_v6_0_ring_get_rptr_gfx(struct amdgpu_ring *ring)
+static u32 gfx_v6_0_ring_get_rptr(struct amdgpu_ring *ring)
{
return ring->adev->wb.wb[ring->rptr_offs];
}
@@ -1675,11 +1675,6 @@
(void)RREG32(CP_RB0_WPTR);
}
-static u32 gfx_v6_0_ring_get_rptr_compute(struct amdgpu_ring *ring)
-{
- return ring->adev->wb.wb[ring->rptr_offs];
-}
-
static u32 gfx_v6_0_ring_get_wptr_compute(struct amdgpu_ring *ring)
{
struct amdgpu_device *adev = ring->adev;
@@ -3129,7 +3124,7 @@
};
static const struct amdgpu_ring_funcs gfx_v6_0_ring_funcs_gfx = {
- .get_rptr = gfx_v6_0_ring_get_rptr_gfx,
+ .get_rptr = gfx_v6_0_ring_get_rptr,
.get_wptr = gfx_v6_0_ring_get_wptr_gfx,
.set_wptr = gfx_v6_0_ring_set_wptr_gfx,
.parse_cs = NULL,
@@ -3146,7 +3141,7 @@
};
static const struct amdgpu_ring_funcs gfx_v6_0_ring_funcs_compute = {
- .get_rptr = gfx_v6_0_ring_get_rptr_compute,
+ .get_rptr = gfx_v6_0_ring_get_rptr,
.get_wptr = gfx_v6_0_ring_get_wptr_compute,
.set_wptr = gfx_v6_0_ring_set_wptr_compute,
.parse_cs = NULL,