diff options
| author | Christian König <christian.koenig@amd.com> | 2013-08-13 11:56:51 +0200 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2013-08-30 16:30:40 -0400 |
| commit | 02c9f7fa4e7230fc4ae8bf26f64e45aa76011f9c (patch) | |
| tree | 356f4dc89d3db10e332664c707de837fa8bc7e3e /drivers/gpu/drm/radeon/si.c | |
| parent | 76a0df859defc53e6cb61f698a48ac7da92c8d84 (diff) | |
| download | blackbird-op-linux-02c9f7fa4e7230fc4ae8bf26f64e45aa76011f9c.tar.gz blackbird-op-linux-02c9f7fa4e7230fc4ae8bf26f64e45aa76011f9c.zip | |
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/si.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/si.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c index da23ce8f4388..4ff59c8f508f 100644 --- a/drivers/gpu/drm/radeon/si.c +++ b/drivers/gpu/drm/radeon/si.c @@ -6416,8 +6416,7 @@ static int si_startup(struct radeon_device *rdev) if (rdev->has_uvd) { ring = &rdev->ring[R600_RING_TYPE_UVD_INDEX]; if (ring->ring_size) { - r = radeon_ring_init(rdev, ring, ring->ring_size, - R600_WB_UVD_RPTR_OFFSET, + r = radeon_ring_init(rdev, ring, ring->ring_size, 0, UVD_RBC_RB_RPTR, UVD_RBC_RB_WPTR, 0, 0xfffff, RADEON_CP_PACKET2); if (!r) |
