summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2014-05-30 17:52:27 +0200
committerChristian König <christian.koenig@amd.com>2014-06-02 10:57:04 +0200
commit91b0275c0ecd1870c5f8bfb73e2da2d6c29414b3 (patch)
treec4b8df20065905271be593123e6cc9dd97c6d7da
parent37903b5e08ec9a481a811287b4db3dfe61f6e31f (diff)
downloadop-kernel-dev-91b0275c0ecd1870c5f8bfb73e2da2d6c29414b3.zip
op-kernel-dev-91b0275c0ecd1870c5f8bfb73e2da2d6c29414b3.tar.gz
drm/radeon: use the CP DMA on CIK
The SDMA sometimes doesn't seem to work reliable. Signed-off-by: Christian König <christian.koenig@amd.com> Cc: stable@vger.kernel.org
-rw-r--r--drivers/gpu/drm/radeon/radeon_asic.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_asic.c b/drivers/gpu/drm/radeon/radeon_asic.c
index be20e62..e5f0177 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,
OpenPOWER on IntegriCloud