diff options
| author | Christian König <christian.koenig@amd.com> | 2013-10-30 11:51:09 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2013-11-01 15:25:52 -0400 |
| commit | 24c164393dd2fa1c1fb51d5fec2f50bd6b7c037b (patch) | |
| tree | 4eb520dad2e03ef9a0f189696e3907c0d3a8fbef /drivers/gpu/drm/radeon/radeon_asic.c | |
| parent | 74d360f66b99231ed7007eb197dd18cda72c961c (diff) | |
drm/radeon: drop CP page table updates & cleanup v2
The DMA ring seems to be stable now.
v2: remove pt_ring_index as well
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 | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_asic.c b/drivers/gpu/drm/radeon/radeon_asic.c index eee5c4a2f166..d4b91675671d 100644 --- a/drivers/gpu/drm/radeon/radeon_asic.c +++ b/drivers/gpu/drm/radeon/radeon_asic.c | |||
| @@ -1622,8 +1622,7 @@ static struct radeon_asic cayman_asic = { | |||
| 1622 | .vm = { | 1622 | .vm = { |
| 1623 | .init = &cayman_vm_init, | 1623 | .init = &cayman_vm_init, |
| 1624 | .fini = &cayman_vm_fini, | 1624 | .fini = &cayman_vm_fini, |
| 1625 | .pt_ring_index = R600_RING_TYPE_DMA_INDEX, | 1625 | .set_page = &cayman_dma_vm_set_page, |
| 1626 | .set_page = &cayman_vm_set_page, | ||
| 1627 | }, | 1626 | }, |
| 1628 | .ring = { | 1627 | .ring = { |
| 1629 | [RADEON_RING_TYPE_GFX_INDEX] = &cayman_gfx_ring, | 1628 | [RADEON_RING_TYPE_GFX_INDEX] = &cayman_gfx_ring, |
| @@ -1723,8 +1722,7 @@ static struct radeon_asic trinity_asic = { | |||
| 1723 | .vm = { | 1722 | .vm = { |
| 1724 | .init = &cayman_vm_init, | 1723 | .init = &cayman_vm_init, |
| 1725 | .fini = &cayman_vm_fini, | 1724 | .fini = &cayman_vm_fini, |
| 1726 | .pt_ring_index = R600_RING_TYPE_DMA_INDEX, | 1725 | .set_page = &cayman_dma_vm_set_page, |
| 1727 | .set_page = &cayman_vm_set_page, | ||
| 1728 | }, | 1726 | }, |
| 1729 | .ring = { | 1727 | .ring = { |
| 1730 | [RADEON_RING_TYPE_GFX_INDEX] = &cayman_gfx_ring, | 1728 | [RADEON_RING_TYPE_GFX_INDEX] = &cayman_gfx_ring, |
| @@ -1854,8 +1852,7 @@ static struct radeon_asic si_asic = { | |||
| 1854 | .vm = { | 1852 | .vm = { |
| 1855 | .init = &si_vm_init, | 1853 | .init = &si_vm_init, |
| 1856 | .fini = &si_vm_fini, | 1854 | .fini = &si_vm_fini, |
| 1857 | .pt_ring_index = R600_RING_TYPE_DMA_INDEX, | 1855 | .set_page = &si_dma_vm_set_page, |
| 1858 | .set_page = &si_vm_set_page, | ||
| 1859 | }, | 1856 | }, |
| 1860 | .ring = { | 1857 | .ring = { |
| 1861 | [RADEON_RING_TYPE_GFX_INDEX] = &si_gfx_ring, | 1858 | [RADEON_RING_TYPE_GFX_INDEX] = &si_gfx_ring, |
| @@ -2000,8 +1997,7 @@ static struct radeon_asic ci_asic = { | |||
| 2000 | .vm = { | 1997 | .vm = { |
| 2001 | .init = &cik_vm_init, | 1998 | .init = &cik_vm_init, |
| 2002 | .fini = &cik_vm_fini, | 1999 | .fini = &cik_vm_fini, |
| 2003 | .pt_ring_index = R600_RING_TYPE_DMA_INDEX, | 2000 | .set_page = &cik_sdma_vm_set_page, |
| 2004 | .set_page = &cik_vm_set_page, | ||
| 2005 | }, | 2001 | }, |
| 2006 | .ring = { | 2002 | .ring = { |
| 2007 | [RADEON_RING_TYPE_GFX_INDEX] = &ci_gfx_ring, | 2003 | [RADEON_RING_TYPE_GFX_INDEX] = &ci_gfx_ring, |
| @@ -2100,8 +2096,7 @@ static struct radeon_asic kv_asic = { | |||
| 2100 | .vm = { | 2096 | .vm = { |
| 2101 | .init = &cik_vm_init, | 2097 | .init = &cik_vm_init, |
| 2102 | .fini = &cik_vm_fini, | 2098 | .fini = &cik_vm_fini, |
| 2103 | .pt_ring_index = R600_RING_TYPE_DMA_INDEX, | 2099 | .set_page = &cik_sdma_vm_set_page, |
| 2104 | .set_page = &cik_vm_set_page, | ||
| 2105 | }, | 2100 | }, |
| 2106 | .ring = { | 2101 | .ring = { |
| 2107 | [RADEON_RING_TYPE_GFX_INDEX] = &ci_gfx_ring, | 2102 | [RADEON_RING_TYPE_GFX_INDEX] = &ci_gfx_ring, |