drm/radeon: drop drivers copy of the rptr

[linux-2.6-block.git] / drivers / gpu / drm / radeon / r600_dma.c

diff --git a/drivers/gpu/drm/radeon/r600_dma.c b/drivers/gpu/drm/radeon/r600_dma.c
index b2d4c91e6272e4fb9dfbfbf669a55705c920eee2..6944e1988426b0832268ec7a0f75767841c64219 100644 (file)
--- a/drivers/gpu/drm/radeon/r600_dma.c
+++ b/drivers/gpu/drm/radeon/r600_dma.c
@@ -176,8 +176,6 @@ int r600_dma_resume(struct radeon_device *rdev)
        ring->wptr = 0;
        WREG32(DMA_RB_WPTR, ring->wptr << 2);
 
-       ring->rptr = RREG32(DMA_RB_RPTR) >> 2;
-
        WREG32(DMA_RB_CNTL, rb_cntl | DMA_RB_ENABLE);
 
        ring->ready = true;
@@ -221,7 +219,7 @@ bool r600_dma_is_lockup(struct radeon_device *rdev, struct radeon_ring *ring)
        u32 reset_mask = r600_gpu_check_soft_reset(rdev);
 
        if (!(reset_mask & RADEON_RESET_DMA)) {
-               radeon_ring_lockup_update(ring);
+               radeon_ring_lockup_update(rdev, ring);
                return false;
        }
        /* force ring activities */