Commit 7edd6b2f authored by Tom St Denis's avatar Tom St Denis Committed by Alex Deucher

drm/amdgpu/gfx7: Simplify wptr/rptr functions

Signed-off-by: default avatarTom St Denis <tom.stdenis@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 6d1d6831
...@@ -2652,21 +2652,14 @@ static int gfx_v7_0_cp_gfx_resume(struct amdgpu_device *adev) ...@@ -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) static u32 gfx_v7_0_ring_get_rptr_gfx(struct amdgpu_ring *ring)
{ {
u32 rptr; return ring->adev->wb.wb[ring->rptr_offs];
rptr = ring->adev->wb.wb[ring->rptr_offs];
return rptr;
} }
static u32 gfx_v7_0_ring_get_wptr_gfx(struct amdgpu_ring *ring) static u32 gfx_v7_0_ring_get_wptr_gfx(struct amdgpu_ring *ring)
{ {
struct amdgpu_device *adev = ring->adev; struct amdgpu_device *adev = ring->adev;
u32 wptr;
wptr = RREG32(mmCP_RB0_WPTR); return RREG32(mmCP_RB0_WPTR);
return wptr;
} }
static void gfx_v7_0_ring_set_wptr_gfx(struct amdgpu_ring *ring) 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) ...@@ -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) static u32 gfx_v7_0_ring_get_rptr_compute(struct amdgpu_ring *ring)
{ {
u32 rptr; return ring->adev->wb.wb[ring->rptr_offs];
rptr = ring->adev->wb.wb[ring->rptr_offs];
return rptr;
} }
static u32 gfx_v7_0_ring_get_wptr_compute(struct amdgpu_ring *ring) static u32 gfx_v7_0_ring_get_wptr_compute(struct amdgpu_ring *ring)
{ {
u32 wptr;
/* XXX check if swapping is necessary on BE */ /* XXX check if swapping is necessary on BE */
wptr = ring->adev->wb.wb[ring->wptr_offs]; return ring->adev->wb.wb[ring->wptr_offs];
return wptr;
} }
static void gfx_v7_0_ring_set_wptr_compute(struct amdgpu_ring *ring) static void gfx_v7_0_ring_set_wptr_compute(struct amdgpu_ring *ring)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment