releases/3.14.7/drm-radeon-use-the-cp-dma-on-cik.patch

   1 From 91b0275c0ecd1870c5f8bfb73e2da2d6c29414b3 Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
   3 Date: Fri, 30 May 2014 17:52:27 +0200
   4 Subject: drm/radeon: use the CP DMA on CIK
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
  10
  11 commit 91b0275c0ecd1870c5f8bfb73e2da2d6c29414b3 upstream.
  12
  13 The SDMA sometimes doesn't seem to work reliable.
  14
  15 Signed-off-by: Christian König <christian.koenig@amd.com>
  16 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  17
  18 ---
  19  drivers/gpu/drm/radeon/radeon_asic.c |    4 ++--
  20  1 file changed, 2 insertions(+), 2 deletions(-)
  21
  22 --- a/drivers/gpu/drm/radeon/radeon_asic.c
  23 +++ b/drivers/gpu/drm/radeon/radeon_asic.c
  24 @@ -2034,8 +2034,8 @@ static struct radeon_asic ci_asic = {
  25                 .blit_ring_index = RADEON_RING_TYPE_GFX_INDEX,
  26                 .dma = &cik_copy_dma,
  27                 .dma_ring_index = R600_RING_TYPE_DMA_INDEX,
  28 -               .copy = &cik_copy_dma,
  29 -               .copy_ring_index = R600_RING_TYPE_DMA_INDEX,
  30 +               .copy = &cik_copy_cpdma,
  31 +               .copy_ring_index = RADEON_RING_TYPE_GFX_INDEX,
  32         },
  33         .surface = {
  34                 .set_reg = r600_set_surface_reg,