diff options
author | Christian König <christian.koenig@amd.com> | 2013-08-13 05:56:52 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2013-08-30 16:30:41 -0400 |
commit | 2e1e6dad6a6d437e4c40611fdcc4e6cd9e2f969e (patch) | |
tree | 325bb0cb184b6a39211403124336f4e18b0728d4 /drivers/gpu/drm/radeon/rv770.c | |
parent | 02c9f7fa4e7230fc4ae8bf26f64e45aa76011f9c (diff) |
drm/radeon: remove special handling for the DMA ring
Now that we have callbacks for [rw]ptr handling we can
remove the special handling for the DMA rings and use
the callbacks instead.
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/rv770.c')
-rw-r--r-- | drivers/gpu/drm/radeon/rv770.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c index 1e8cf49d5871..fd9dcb2d182b 100644 --- a/drivers/gpu/drm/radeon/rv770.c +++ b/drivers/gpu/drm/radeon/rv770.c | |||
@@ -1899,14 +1899,14 @@ static int rv770_startup(struct radeon_device *rdev) | |||
1899 | ring = &rdev->ring[RADEON_RING_TYPE_GFX_INDEX]; | 1899 | ring = &rdev->ring[RADEON_RING_TYPE_GFX_INDEX]; |
1900 | r = radeon_ring_init(rdev, ring, ring->ring_size, RADEON_WB_CP_RPTR_OFFSET, | 1900 | r = radeon_ring_init(rdev, ring, ring->ring_size, RADEON_WB_CP_RPTR_OFFSET, |
1901 | R600_CP_RB_RPTR, R600_CP_RB_WPTR, | 1901 | R600_CP_RB_RPTR, R600_CP_RB_WPTR, |
1902 | 0, 0xfffff, RADEON_CP_PACKET2); | 1902 | RADEON_CP_PACKET2); |
1903 | if (r) | 1903 | if (r) |
1904 | return r; | 1904 | return r; |
1905 | 1905 | ||
1906 | ring = &rdev->ring[R600_RING_TYPE_DMA_INDEX]; | 1906 | ring = &rdev->ring[R600_RING_TYPE_DMA_INDEX]; |
1907 | r = radeon_ring_init(rdev, ring, ring->ring_size, R600_WB_DMA_RPTR_OFFSET, | 1907 | r = radeon_ring_init(rdev, ring, ring->ring_size, R600_WB_DMA_RPTR_OFFSET, |
1908 | DMA_RB_RPTR, DMA_RB_WPTR, | 1908 | DMA_RB_RPTR, DMA_RB_WPTR, |
1909 | 2, 0x3fffc, DMA_PACKET(DMA_PACKET_NOP, 0, 0, 0)); | 1909 | DMA_PACKET(DMA_PACKET_NOP, 0, 0, 0)); |
1910 | if (r) | 1910 | if (r) |
1911 | return r; | 1911 | return r; |
1912 | 1912 | ||
@@ -1925,7 +1925,7 @@ static int rv770_startup(struct radeon_device *rdev) | |||
1925 | if (ring->ring_size) { | 1925 | if (ring->ring_size) { |
1926 | r = radeon_ring_init(rdev, ring, ring->ring_size, 0, | 1926 | r = radeon_ring_init(rdev, ring, ring->ring_size, 0, |
1927 | UVD_RBC_RB_RPTR, UVD_RBC_RB_WPTR, | 1927 | UVD_RBC_RB_RPTR, UVD_RBC_RB_WPTR, |
1928 | 0, 0xfffff, RADEON_CP_PACKET2); | 1928 | RADEON_CP_PACKET2); |
1929 | if (!r) | 1929 | if (!r) |
1930 | r = r600_uvd_init(rdev, true); | 1930 | r = r600_uvd_init(rdev, true); |
1931 | 1931 | ||