7 files changed, 27 insertions, 11 deletions

diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
index ba19b9a697b0..6ff1180c7321 100644
--- a/drivers/gpu/drm/radeon/evergreen.c
+++ b/drivers/gpu/drm/radeon/evergreen.c
@@ -3127,7 +3127,8 @@ static int evergreen_startup(struct radeon_device *rdev)
         evergreen_irq_set(rdev);
 
         r = radeon_ring_init(rdev, ring, ring->ring_size, RADEON_WB_CP_RPTR_OFFSET,
-                             R600_CP_RB_RPTR, R600_CP_RB_WPTR);
+                             R600_CP_RB_RPTR, R600_CP_RB_WPTR,
+                             0, 0xfffff, RADEON_CP_PACKET2);
         if (r)
                 return r;
         r = evergreen_cp_load_microcode(rdev);
diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
index a9b0e615804f..d0d23c547643 100644
--- a/drivers/gpu/drm/radeon/ni.c
+++ b/drivers/gpu/drm/radeon/ni.c
@@ -1412,7 +1412,8 @@ static int cayman_startup(struct radeon_device *rdev)
         evergreen_irq_set(rdev);
 
         r = radeon_ring_init(rdev, ring, ring->ring_size, RADEON_WB_CP_RPTR_OFFSET,
-                             CP_RB0_RPTR, CP_RB0_WPTR);
+                             CP_RB0_RPTR, CP_RB0_WPTR,
+                             0, 0xfffff, RADEON_CP_PACKET2);
         if (r)
                 return r;
         r = cayman_cp_load_microcode(rdev);
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
index bed56c7b690b..3ef2c58b8407 100644
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
@@ -1075,7 +1075,8 @@ int r100_cp_init(struct radeon_device *rdev, unsigned ring_size)
         ring_size = (1 << (rb_bufsz + 1)) * 4;
         r100_cp_load_microcode(rdev);
         r = radeon_ring_init(rdev, ring, ring_size, RADEON_WB_CP_RPTR_OFFSET,
-                             RADEON_CP_RB_RPTR, RADEON_CP_RB_WPTR);
+                             RADEON_CP_RB_RPTR, RADEON_CP_RB_WPTR,
+                             0, 0x7fffff, RADEON_CP_PACKET2);
         if (r) {
                 return r;
         }
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index f2deadfcd88f..48bd8202b5c9 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -2474,7 +2474,8 @@ int r600_startup(struct radeon_device *rdev)
         r600_irq_set(rdev);
 
         r = radeon_ring_init(rdev, ring, ring->ring_size, RADEON_WB_CP_RPTR_OFFSET,
-                             R600_CP_RB_RPTR, R600_CP_RB_WPTR);
+                             R600_CP_RB_RPTR, R600_CP_RB_WPTR,
+                             0, 0xfffff, RADEON_CP_PACKET2);
 
         if (r)
                 return r;
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index 5777afb361de..e5d5271d7a9c 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -542,6 +542,9 @@ struct radeon_ring {
         uint32_t                ptr_mask;
         struct mutex            mutex;
         bool                    ready;
+        u32                     ptr_reg_shift;
+        u32                     ptr_reg_mask;
+        u32                     nop;
 };
 
 /*
@@ -612,7 +615,8 @@ void radeon_ring_unlock_commit(struct radeon_device *rdev, struct radeon_ring *c
 void radeon_ring_unlock_undo(struct radeon_device *rdev, struct radeon_ring *cp);
 int radeon_ring_test(struct radeon_device *rdev, struct radeon_ring *cp);
 int radeon_ring_init(struct radeon_device *rdev, struct radeon_ring *cp, unsigned ring_size,
-                     unsigned rptr_offs, unsigned rptr_reg, unsigned wptr_reg);
+                     unsigned rptr_offs, unsigned rptr_reg, unsigned wptr_reg,
+                     u32 ptr_reg_shift, u32 ptr_reg_mask, u32 nop);
 void radeon_ring_fini(struct radeon_device *rdev, struct radeon_ring *cp);
 
 
diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c
index b39a1d9306e5..133e2636cea0 100644
--- a/drivers/gpu/drm/radeon/radeon_ring.c
+++ b/drivers/gpu/drm/radeon/radeon_ring.c
@@ -305,10 +305,13 @@ int radeon_ring_index(struct radeon_device *rdev, struct radeon_ring *ring)
 
 void radeon_ring_free_size(struct radeon_device *rdev, struct radeon_ring *ring)
 {
+        u32 rptr;
+
         if (rdev->wb.enabled)
-                ring->rptr = le32_to_cpu(rdev->wb.wb[ring->rptr_offs/4]);
+                rptr = le32_to_cpu(rdev->wb.wb[ring->rptr_offs/4]);
         else
-                ring->rptr = RREG32(ring->rptr_reg);
+                rptr = RREG32(ring->rptr_reg);
+        ring->rptr = (rptr & ring->ptr_reg_mask) >> ring->ptr_reg_shift;
         /* This works because ring_size is a power of 2 */
         ring->ring_free_dw = (ring->rptr + (ring->ring_size / 4));
         ring->ring_free_dw -= ring->wptr;
@@ -362,10 +365,10 @@ void radeon_ring_commit(struct radeon_device *rdev, struct radeon_ring *ring)
         count_dw_pad = (ring->align_mask + 1) -
                        (ring->wptr & ring->align_mask);
         for (i = 0; i < count_dw_pad; i++) {
-                radeon_ring_write(ring, 2 << 30);
+                radeon_ring_write(ring, ring->nop);
         }
         DRM_MEMORYBARRIER();
-        WREG32(ring->wptr_reg, ring->wptr);
+        WREG32(ring->wptr_reg, (ring->wptr << ring->ptr_reg_shift) & ring->ptr_reg_mask);
         (void)RREG32(ring->wptr_reg);
 }
 
@@ -382,7 +385,8 @@ void radeon_ring_unlock_undo(struct radeon_device *rdev, struct radeon_ring *rin
 }
 
 int radeon_ring_init(struct radeon_device *rdev, struct radeon_ring *ring, unsigned ring_size,
-                     unsigned rptr_offs, unsigned rptr_reg, unsigned wptr_reg)
+                     unsigned rptr_offs, unsigned rptr_reg, unsigned wptr_reg,
+                     u32 ptr_reg_shift, u32 ptr_reg_mask, u32 nop)
 {
         int r;
 
@@ -390,6 +394,9 @@ int radeon_ring_init(struct radeon_device *rdev, struct radeon_ring *ring, unsig
         ring->rptr_offs = rptr_offs;
         ring->rptr_reg = rptr_reg;
         ring->wptr_reg = wptr_reg;
+        ring->ptr_reg_shift = ptr_reg_shift;
+        ring->ptr_reg_mask = ptr_reg_mask;
+        ring->nop = nop;
         /* Allocate ring buffer */
         if (ring->ring_obj == NULL) {
                 r = radeon_bo_create(rdev, ring->ring_size, PAGE_SIZE, true,
diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c
index 0a1283d24027..d854fbfa5a52 100644
--- a/drivers/gpu/drm/radeon/rv770.c
+++ b/drivers/gpu/drm/radeon/rv770.c
@@ -1099,7 +1099,8 @@ static int rv770_startup(struct radeon_device *rdev)
         r600_irq_set(rdev);
 
         r = radeon_ring_init(rdev, ring, ring->ring_size, RADEON_WB_CP_RPTR_OFFSET,
-                             R600_CP_RB_RPTR, R600_CP_RB_WPTR);
+                             R600_CP_RB_RPTR, R600_CP_RB_WPTR,
+                             0, 0xfffff, RADEON_CP_PACKET2);
         if (r)
                 return r;
         r = rv770_cp_load_microcode(rdev);