diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2013-07-12 14:52:30 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2013-08-30 16:29:57 -0400 |
| commit | 8dddb993bc87b06590f64da5578663386498aafa (patch) | |
| tree | 58bbcd1db7b12d8c894f459b0805267cc2c65d14 | |
| parent | 118bdbd86b39dbb843155054021d2c59058f1e05 (diff) | |
drm/radeon: switch r6xx+ to using CP DMA for the blit copy callback
CP DMA is lighter weight than using the 3D engine.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_asic.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_asic.c b/drivers/gpu/drm/radeon/radeon_asic.c index f8f8b3113ddd..1926ec06a638 100644 --- a/drivers/gpu/drm/radeon/radeon_asic.c +++ b/drivers/gpu/drm/radeon/radeon_asic.c | |||
| @@ -1022,7 +1022,7 @@ static struct radeon_asic r600_asic = { | |||
| 1022 | .hdmi_setmode = &r600_hdmi_setmode, | 1022 | .hdmi_setmode = &r600_hdmi_setmode, |
| 1023 | }, | 1023 | }, |
| 1024 | .copy = { | 1024 | .copy = { |
| 1025 | .blit = &r600_copy_blit, | 1025 | .blit = &r600_copy_cpdma, |
| 1026 | .blit_ring_index = RADEON_RING_TYPE_GFX_INDEX, | 1026 | .blit_ring_index = RADEON_RING_TYPE_GFX_INDEX, |
| 1027 | .dma = &r600_copy_dma, | 1027 | .dma = &r600_copy_dma, |
| 1028 | .dma_ring_index = R600_RING_TYPE_DMA_INDEX, | 1028 | .dma_ring_index = R600_RING_TYPE_DMA_INDEX, |
| @@ -1115,7 +1115,7 @@ static struct radeon_asic rv6xx_asic = { | |||
| 1115 | .get_backlight_level = &atombios_get_backlight_level, | 1115 | .get_backlight_level = &atombios_get_backlight_level, |
| 1116 | }, | 1116 | }, |
| 1117 | .copy = { | 1117 | .copy = { |
| 1118 | .blit = &r600_copy_blit, | 1118 | .blit = &r600_copy_cpdma, |
| 1119 | .blit_ring_index = RADEON_RING_TYPE_GFX_INDEX, | 1119 | .blit_ring_index = RADEON_RING_TYPE_GFX_INDEX, |
| 1120 | .dma = &r600_copy_dma, | 1120 | .dma = &r600_copy_dma, |
| 1121 | .dma_ring_index = R600_RING_TYPE_DMA_INDEX, | 1121 | .dma_ring_index = R600_RING_TYPE_DMA_INDEX, |
| @@ -1226,7 +1226,7 @@ static struct radeon_asic rs780_asic = { | |||
| 1226 | .hdmi_setmode = &r600_hdmi_setmode, | 1226 | .hdmi_setmode = &r600_hdmi_setmode, |
| 1227 | }, | 1227 | }, |
| 1228 | .copy = { | 1228 | .copy = { |
| 1229 | .blit = &r600_copy_blit, | 1229 | .blit = &r600_copy_cpdma, |
| 1230 | .blit_ring_index = RADEON_RING_TYPE_GFX_INDEX, | 1230 | .blit_ring_index = RADEON_RING_TYPE_GFX_INDEX, |
| 1231 | .dma = &r600_copy_dma, | 1231 | .dma = &r600_copy_dma, |
| 1232 | .dma_ring_index = R600_RING_TYPE_DMA_INDEX, | 1232 | .dma_ring_index = R600_RING_TYPE_DMA_INDEX, |
| @@ -1348,7 +1348,7 @@ static struct radeon_asic rv770_asic = { | |||
| 1348 | .hdmi_setmode = &r600_hdmi_setmode, | 1348 | .hdmi_setmode = &r600_hdmi_setmode, |
| 1349 | }, | 1349 | }, |
| 1350 | .copy = { | 1350 | .copy = { |
| 1351 | .blit = &r600_copy_blit, | 1351 | .blit = &r600_copy_cpdma, |
| 1352 | .blit_ring_index = RADEON_RING_TYPE_GFX_INDEX, | 1352 | .blit_ring_index = RADEON_RING_TYPE_GFX_INDEX, |
| 1353 | .dma = &rv770_copy_dma, | 1353 | .dma = &rv770_copy_dma, |
| 1354 | .dma_ring_index = R600_RING_TYPE_DMA_INDEX, | 1354 | .dma_ring_index = R600_RING_TYPE_DMA_INDEX, |
| @@ -1473,7 +1473,7 @@ static struct radeon_asic evergreen_asic = { | |||
| 1473 | .hdmi_setmode = &evergreen_hdmi_setmode, | 1473 | .hdmi_setmode = &evergreen_hdmi_setmode, |
| 1474 | }, | 1474 | }, |
| 1475 | .copy = { | 1475 | .copy = { |
| 1476 | .blit = &r600_copy_blit, | 1476 | .blit = &r600_copy_cpdma, |
| 1477 | .blit_ring_index = RADEON_RING_TYPE_GFX_INDEX, | 1477 | .blit_ring_index = RADEON_RING_TYPE_GFX_INDEX, |
| 1478 | .dma = &evergreen_copy_dma, | 1478 | .dma = &evergreen_copy_dma, |
| 1479 | .dma_ring_index = R600_RING_TYPE_DMA_INDEX, | 1479 | .dma_ring_index = R600_RING_TYPE_DMA_INDEX, |
| @@ -1598,7 +1598,7 @@ static struct radeon_asic sumo_asic = { | |||
| 1598 | .hdmi_setmode = &evergreen_hdmi_setmode, | 1598 | .hdmi_setmode = &evergreen_hdmi_setmode, |
| 1599 | }, | 1599 | }, |
| 1600 | .copy = { | 1600 | .copy = { |
| 1601 | .blit = &r600_copy_blit, | 1601 | .blit = &r600_copy_cpdma, |
| 1602 | .blit_ring_index = RADEON_RING_TYPE_GFX_INDEX, | 1602 | .blit_ring_index = RADEON_RING_TYPE_GFX_INDEX, |
| 1603 | .dma = &evergreen_copy_dma, | 1603 | .dma = &evergreen_copy_dma, |
| 1604 | .dma_ring_index = R600_RING_TYPE_DMA_INDEX, | 1604 | .dma_ring_index = R600_RING_TYPE_DMA_INDEX, |
| @@ -1722,7 +1722,7 @@ static struct radeon_asic btc_asic = { | |||
| 1722 | .hdmi_setmode = &evergreen_hdmi_setmode, | 1722 | .hdmi_setmode = &evergreen_hdmi_setmode, |
| 1723 | }, | 1723 | }, |
| 1724 | .copy = { | 1724 | .copy = { |
| 1725 | .blit = &r600_copy_blit, | 1725 | .blit = &r600_copy_cpdma, |
| 1726 | .blit_ring_index = RADEON_RING_TYPE_GFX_INDEX, | 1726 | .blit_ring_index = RADEON_RING_TYPE_GFX_INDEX, |
| 1727 | .dma = &evergreen_copy_dma, | 1727 | .dma = &evergreen_copy_dma, |
| 1728 | .dma_ring_index = R600_RING_TYPE_DMA_INDEX, | 1728 | .dma_ring_index = R600_RING_TYPE_DMA_INDEX, |
| @@ -1899,7 +1899,7 @@ static struct radeon_asic cayman_asic = { | |||
| 1899 | .hdmi_setmode = &evergreen_hdmi_setmode, | 1899 | .hdmi_setmode = &evergreen_hdmi_setmode, |
| 1900 | }, | 1900 | }, |
| 1901 | .copy = { | 1901 | .copy = { |
| 1902 | .blit = &r600_copy_blit, | 1902 | .blit = &r600_copy_cpdma, |
| 1903 | .blit_ring_index = RADEON_RING_TYPE_GFX_INDEX, | 1903 | .blit_ring_index = RADEON_RING_TYPE_GFX_INDEX, |
| 1904 | .dma = &evergreen_copy_dma, | 1904 | .dma = &evergreen_copy_dma, |
| 1905 | .dma_ring_index = R600_RING_TYPE_DMA_INDEX, | 1905 | .dma_ring_index = R600_RING_TYPE_DMA_INDEX, |
| @@ -2074,7 +2074,7 @@ static struct radeon_asic trinity_asic = { | |||
| 2074 | .get_backlight_level = &atombios_get_backlight_level, | 2074 | .get_backlight_level = &atombios_get_backlight_level, |
| 2075 | }, | 2075 | }, |
| 2076 | .copy = { | 2076 | .copy = { |
| 2077 | .blit = &r600_copy_blit, | 2077 | .blit = &r600_copy_cpdma, |
| 2078 | .blit_ring_index = RADEON_RING_TYPE_GFX_INDEX, | 2078 | .blit_ring_index = RADEON_RING_TYPE_GFX_INDEX, |
| 2079 | .dma = &evergreen_copy_dma, | 2079 | .dma = &evergreen_copy_dma, |
| 2080 | .dma_ring_index = R600_RING_TYPE_DMA_INDEX, | 2080 | .dma_ring_index = R600_RING_TYPE_DMA_INDEX, |