1 files changed, 14 insertions, 5 deletions

diff --git a/drivers/gpu/drm/radeon/r600_dma.c b/drivers/gpu/drm/radeon/r600_dma.c
index 7844d15c139f..b2d4c91e6272 100644
--- a/drivers/gpu/drm/radeon/r600_dma.c
+++ b/drivers/gpu/drm/radeon/r600_dma.c
@@ -51,7 +51,14 @@ u32 r600_gpu_check_soft_reset(struct radeon_device *rdev);
 uint32_t r600_dma_get_rptr(struct radeon_device *rdev,
                            struct radeon_ring *ring)
 {
-        return (radeon_ring_generic_get_rptr(rdev, ring) & 0x3fffc) >> 2;
+        u32 rptr;
+
+        if (rdev->wb.enabled)
+                rptr = rdev->wb.wb[ring->rptr_offs/4];
+        else
+                rptr = RREG32(DMA_RB_RPTR);
+
+        return (rptr & 0x3fffc) >> 2;
 }
 
 /**
@@ -65,7 +72,7 @@ uint32_t r600_dma_get_rptr(struct radeon_device *rdev,
 uint32_t r600_dma_get_wptr(struct radeon_device *rdev,
                            struct radeon_ring *ring)
 {
-        return (RREG32(ring->wptr_reg) & 0x3fffc) >> 2;
+        return (RREG32(DMA_RB_WPTR) & 0x3fffc) >> 2;
 }
 
 /**
@@ -79,7 +86,7 @@ uint32_t r600_dma_get_wptr(struct radeon_device *rdev,
 void r600_dma_set_wptr(struct radeon_device *rdev,
                        struct radeon_ring *ring)
 {
-        WREG32(ring->wptr_reg, (ring->wptr << 2) & 0x3fffc);
+        WREG32(DMA_RB_WPTR, (ring->wptr << 2) & 0x3fffc);
 }
 
 /**
@@ -93,7 +100,8 @@ void r600_dma_stop(struct radeon_device *rdev)
 {
         u32 rb_cntl = RREG32(DMA_RB_CNTL);
 
-        radeon_ttm_set_active_vram_size(rdev, rdev->mc.visible_vram_size);
+        if (rdev->asic->copy.copy_ring_index == R600_RING_TYPE_DMA_INDEX)
+                radeon_ttm_set_active_vram_size(rdev, rdev->mc.visible_vram_size);
 
         rb_cntl &= ~DMA_RB_ENABLE;
         WREG32(DMA_RB_CNTL, rb_cntl);
@@ -180,7 +188,8 @@ int r600_dma_resume(struct radeon_device *rdev)
                 return r;
         }
 
-        radeon_ttm_set_active_vram_size(rdev, rdev->mc.real_vram_size);
+        if (rdev->asic->copy.copy_ring_index == R600_RING_TYPE_DMA_INDEX)
+                radeon_ttm_set_active_vram_size(rdev, rdev->mc.real_vram_size);
 
         return 0;
 }