diff options
author | Christian König <christian.koenig@amd.com> | 2013-08-13 05:56:51 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2013-08-30 16:30:40 -0400 |
commit | 02c9f7fa4e7230fc4ae8bf26f64e45aa76011f9c (patch) | |
tree | 356f4dc89d3db10e332664c707de837fa8bc7e3e /drivers/gpu/drm/radeon/ni.c | |
parent | 76a0df859defc53e6cb61f698a48ac7da92c8d84 (diff) |
drm/radeon: rework UVD writeback & [rw]ptr handling
The hardware just doesn't support this correctly.
Disable it before we accidentally write anywhere we shouldn't.
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/ni.c')
-rw-r--r-- | drivers/gpu/drm/radeon/ni.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c index bc298a3500a4..f543f4ca4dda 100644 --- a/drivers/gpu/drm/radeon/ni.c +++ b/drivers/gpu/drm/radeon/ni.c | |||
@@ -2225,8 +2225,7 @@ static int cayman_startup(struct radeon_device *rdev) | |||
2225 | 2225 | ||
2226 | ring = &rdev->ring[R600_RING_TYPE_UVD_INDEX]; | 2226 | ring = &rdev->ring[R600_RING_TYPE_UVD_INDEX]; |
2227 | if (ring->ring_size) { | 2227 | if (ring->ring_size) { |
2228 | r = radeon_ring_init(rdev, ring, ring->ring_size, | 2228 | r = radeon_ring_init(rdev, ring, ring->ring_size, 0, |
2229 | R600_WB_UVD_RPTR_OFFSET, | ||
2230 | UVD_RBC_RB_RPTR, UVD_RBC_RB_WPTR, | 2229 | UVD_RBC_RB_RPTR, UVD_RBC_RB_WPTR, |
2231 | 0, 0xfffff, RADEON_CP_PACKET2); | 2230 | 0, 0xfffff, RADEON_CP_PACKET2); |
2232 | if (!r) | 2231 | if (!r) |