diff options
| author | Christian König <christian.koenig@amd.com> | 2014-02-18 17:52:33 +0400 |
|---|---|---|
| committer | Christian König <christian.koenig@amd.com> | 2014-02-18 20:49:19 +0400 |
| commit | ff212f25feb44a915ce9c0144faef7fae27a6e61 (patch) | |
| tree | 4cfdebae7d47c5504d087ef8950e068a426f1270 /drivers/gpu/drm/radeon/cik_sdma.c | |
| parent | a1d6f97c8cfa7c3554d0391c0b16505d1d97f380 (diff) | |
| download | linux-ff212f25feb44a915ce9c0144faef7fae27a6e61.tar.xz | |
drm/radeon: drop drivers copy of the rptr
In all cases where it really matters we are using the read functions anyway.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/cik_sdma.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/cik_sdma.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/cik_sdma.c b/drivers/gpu/drm/radeon/cik_sdma.c index 1ecb3f1070e3..e474760d714c 100644 --- a/drivers/gpu/drm/radeon/cik_sdma.c +++ b/drivers/gpu/drm/radeon/cik_sdma.c @@ -362,8 +362,6 @@ static int cik_sdma_gfx_resume(struct radeon_device *rdev) ring->wptr = 0; WREG32(SDMA0_GFX_RB_WPTR + reg_offset, ring->wptr << 2); - ring->rptr = RREG32(SDMA0_GFX_RB_RPTR + reg_offset) >> 2; - /* enable DMA RB */ WREG32(SDMA0_GFX_RB_CNTL + reg_offset, rb_cntl | SDMA_RB_ENABLE); @@ -713,7 +711,7 @@ bool cik_sdma_is_lockup(struct radeon_device *rdev, struct radeon_ring *ring) mask = RADEON_RESET_DMA1; if (!(reset_mask & mask)) { - radeon_ring_lockup_update(ring); + radeon_ring_lockup_update(rdev, ring); return false; } /* force ring activities */ |