From: Christian König Date: Fri, 30 May 2014 15:52:27 +0000 (+0200) Subject: drm/radeon: use the CP DMA on CIK X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=91b0275c0ecd1870c5f8bfb73e2da2d6c29414b3;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git drm/radeon: use the CP DMA on CIK The SDMA sometimes doesn't seem to work reliable. Signed-off-by: Christian König Cc: stable@vger.kernel.org --- diff --git a/drivers/gpu/drm/radeon/radeon_asic.c b/drivers/gpu/drm/radeon/radeon_asic.c index be20e62dac83..e5f0177bea1e 100644 --- a/drivers/gpu/drm/radeon/radeon_asic.c +++ b/drivers/gpu/drm/radeon/radeon_asic.c @@ -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,