drm/radeon: use the CP DMA on CIK
authorChristian König <christian.koenig@amd.com>
Fri, 30 May 2014 15:52:27 +0000 (17:52 +0200)
committerChristian König <christian.koenig@amd.com>
Mon, 2 Jun 2014 08:57:04 +0000 (10:57 +0200)
The SDMA sometimes doesn't seem to work reliable.

Signed-off-by: Christian König <christian.koenig@amd.com>
Cc: stable@vger.kernel.org
drivers/gpu/drm/radeon/radeon_asic.c

index be20e62..e5f0177 100644 (file)
@@ -2049,8 +2049,8 @@ static struct radeon_asic ci_asic = {
                .blit_ring_index = RADEON_RING_TYPE_GFX_INDEX,
                .dma = &cik_copy_dma,
                .dma_ring_index = R600_RING_TYPE_DMA_INDEX,
-               .copy = &cik_copy_dma,
-               .copy_ring_index = R600_RING_TYPE_DMA_INDEX,
+               .copy = &cik_copy_cpdma,
+               .copy_ring_index = RADEON_RING_TYPE_GFX_INDEX,
        },
        .surface = {
                .set_reg = r600_set_surface_reg,