diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-01-08 14:52:52 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-01-08 14:52:52 +1000 |
| commit | c75be2592c350035ce871624ebf549b4609aeeab (patch) | |
| tree | da25117dac120ea28c36a33a4ca6fd3eb3a4ebbf /drivers/gpu/drm/radeon/radeon_asic.c | |
| parent | be8a42ae60addd8b6092535c11b42d099d6470ec (diff) | |
| parent | d1f9809ed1315c4cdc5760cf2f59626fd3276952 (diff) | |
| download | blackbird-op-linux-c75be2592c350035ce871624ebf549b4609aeeab.tar.gz blackbird-op-linux-c75be2592c350035ce871624ebf549b4609aeeab.zip | |
Merge branch 'drm-fixes-3.8' of git://people.freedesktop.org/~agd5f/linux into drm-next
Alex writes:
A few more fixes for DMA and a mac quirk.
* 'drm-fixes-3.8' of git://people.freedesktop.org/~agd5f/linux:
drm/radeon: add quirk for d3 delay during switcheroo poweron for apple macbooks
drm/radeon: fix DMA CS parser for r6xx linear copy packet
drm/radeon: split r6xx and r7xx copy_dma functions
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 596bcbe80ed0..9056fafb00ea 100644 --- a/drivers/gpu/drm/radeon/radeon_asic.c +++ b/drivers/gpu/drm/radeon/radeon_asic.c @@ -1140,9 +1140,9 @@ static struct radeon_asic rv770_asic = { .copy = { .blit = &r600_copy_blit, .blit_ring_index = RADEON_RING_TYPE_GFX_INDEX, - .dma = &r600_copy_dma, + .dma = &rv770_copy_dma, .dma_ring_index = R600_RING_TYPE_DMA_INDEX, - .copy = &r600_copy_dma, + .copy = &rv770_copy_dma, .copy_ring_index = R600_RING_TYPE_DMA_INDEX, }, .surface = { |
