diff options
Diffstat (limited to 'drivers/gpu/drm/radeon/r600.c')
-rw-r--r-- | drivers/gpu/drm/radeon/r600.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index 3cb9d6089373..bc2540b17c5e 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c | |||
@@ -2313,7 +2313,7 @@ void r600_dma_stop(struct radeon_device *rdev) | |||
2313 | int r600_dma_resume(struct radeon_device *rdev) | 2313 | int r600_dma_resume(struct radeon_device *rdev) |
2314 | { | 2314 | { |
2315 | struct radeon_ring *ring = &rdev->ring[R600_RING_TYPE_DMA_INDEX]; | 2315 | struct radeon_ring *ring = &rdev->ring[R600_RING_TYPE_DMA_INDEX]; |
2316 | u32 rb_cntl, dma_cntl; | 2316 | u32 rb_cntl, dma_cntl, ib_cntl; |
2317 | u32 rb_bufsz; | 2317 | u32 rb_bufsz; |
2318 | int r; | 2318 | int r; |
2319 | 2319 | ||
@@ -2353,7 +2353,11 @@ int r600_dma_resume(struct radeon_device *rdev) | |||
2353 | WREG32(DMA_RB_BASE, ring->gpu_addr >> 8); | 2353 | WREG32(DMA_RB_BASE, ring->gpu_addr >> 8); |
2354 | 2354 | ||
2355 | /* enable DMA IBs */ | 2355 | /* enable DMA IBs */ |
2356 | WREG32(DMA_IB_CNTL, DMA_IB_ENABLE); | 2356 | ib_cntl = DMA_IB_ENABLE; |
2357 | #ifdef __BIG_ENDIAN | ||
2358 | ib_cntl |= DMA_IB_SWAP_ENABLE; | ||
2359 | #endif | ||
2360 | WREG32(DMA_IB_CNTL, ib_cntl); | ||
2357 | 2361 | ||
2358 | dma_cntl = RREG32(DMA_CNTL); | 2362 | dma_cntl = RREG32(DMA_CNTL); |
2359 | dma_cntl &= ~CTXEMPTY_INT_ENABLE; | 2363 | dma_cntl &= ~CTXEMPTY_INT_ENABLE; |