drm/radeon: rework UVD writeback & [rw]ptr handling

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / radeon / si.c

diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c
index da23ce8f4388d33caf3a648f7b0c162b84c7b152..4ff59c8f508f6c32d2b6f1b2caaf1d4c8200556a 100644 (file)
--- 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)