diff options
| author | Christian König <christian.koenig@amd.com> | 2014-06-04 15:29:58 +0200 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2014-06-09 22:06:52 -0400 |
| commit | b5be1a839a33634393394e4782edaa37a4bc1a1e (patch) | |
| tree | 42feb0330260cf4fc10e8f25eb45645e5752488b /drivers/gpu/drm/radeon/radeon_asic.c | |
| parent | 7f90fc965023d72589a4e5fc02ac812e3a6ac809 (diff) | |
| download | linux-stable-b5be1a839a33634393394e4782edaa37a4bc1a1e.tar.gz linux-stable-b5be1a839a33634393394e4782edaa37a4bc1a1e.tar.bz2 linux-stable-b5be1a839a33634393394e4782edaa37a4bc1a1e.zip | |
drm/radeon: use the SDMA on for buffer moves on CIK again
The underlying reason for the crashes seems to be fixed now.
Signed-off-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_asic.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_asic.c | 4 |
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 34ea53d980a1..34b9aa9e3c06 100644 --- a/drivers/gpu/drm/radeon/radeon_asic.c +++ b/drivers/gpu/drm/radeon/radeon_asic.c @@ -2029,8 +2029,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_cpdma, - .copy_ring_index = RADEON_RING_TYPE_GFX_INDEX, + .copy = &cik_copy_dma, + .copy_ring_index = R600_RING_TYPE_DMA_INDEX, }, .surface = { .set_reg = r600_set_surface_reg, |