1 files changed, 0 insertions, 8 deletions

diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c
index 7619bc6bb242..c698e3fe007a 100644
--- a/drivers/gpu/drm/radeon/si.c
+++ b/drivers/gpu/drm/radeon/si.c
@@ -6412,37 +6412,30 @@ static int si_startup(struct radeon_device *rdev)
 
         ring = &rdev->ring[RADEON_RING_TYPE_GFX_INDEX];
         r = radeon_ring_init(rdev, ring, ring->ring_size, RADEON_WB_CP_RPTR_OFFSET,
-                             CP_RB0_RPTR, CP_RB0_WPTR,
                              RADEON_CP_PACKET2);
         if (r)
                 return r;
 
         ring = &rdev->ring[CAYMAN_RING_TYPE_CP1_INDEX];
         r = radeon_ring_init(rdev, ring, ring->ring_size, RADEON_WB_CP1_RPTR_OFFSET,
-                             CP_RB1_RPTR, CP_RB1_WPTR,
                              RADEON_CP_PACKET2);
         if (r)
                 return r;
 
         ring = &rdev->ring[CAYMAN_RING_TYPE_CP2_INDEX];
         r = radeon_ring_init(rdev, ring, ring->ring_size, RADEON_WB_CP2_RPTR_OFFSET,
-                             CP_RB2_RPTR, CP_RB2_WPTR,
                              RADEON_CP_PACKET2);
         if (r)
                 return r;
 
         ring = &rdev->ring[R600_RING_TYPE_DMA_INDEX];
         r = radeon_ring_init(rdev, ring, ring->ring_size, R600_WB_DMA_RPTR_OFFSET,
-                             DMA_RB_RPTR + DMA0_REGISTER_OFFSET,
-                             DMA_RB_WPTR + DMA0_REGISTER_OFFSET,
                              DMA_PACKET(DMA_PACKET_NOP, 0, 0, 0, 0));
         if (r)
                 return r;
 
         ring = &rdev->ring[CAYMAN_RING_TYPE_DMA1_INDEX];
         r = radeon_ring_init(rdev, ring, ring->ring_size, CAYMAN_WB_DMA1_RPTR_OFFSET,
-                             DMA_RB_RPTR + DMA1_REGISTER_OFFSET,
-                             DMA_RB_WPTR + DMA1_REGISTER_OFFSET,
                              DMA_PACKET(DMA_PACKET_NOP, 0, 0, 0, 0));
         if (r)
                 return r;
@@ -6462,7 +6455,6 @@ static int si_startup(struct radeon_device *rdev)
                 ring = &rdev->ring[R600_RING_TYPE_UVD_INDEX];
                 if (ring->ring_size) {
                         r = radeon_ring_init(rdev, ring, ring->ring_size, 0,
-                                             UVD_RBC_RB_RPTR, UVD_RBC_RB_WPTR,
                                              RADEON_CP_PACKET2);
                         if (!r)
                                 r = uvd_v1_0_init(rdev);