drm: Merge tag 'v3.3-rc7' into drm-core-next

[karo-tx-linux.git] / drivers / gpu / drm / radeon / ni.c

diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
index 2509c505acb896a51e370f3078ee660b61cabe1d..160799c14b91a9d4db7d166186f27c1da5b47ca6 100644 (file)
--- a/drivers/gpu/drm/radeon/ni.c
+++ b/drivers/gpu/drm/radeon/ni.c
@@ -1318,7 +1318,7 @@ int cayman_cp_resume(struct radeon_device *rdev)
        rdev->ring[CAYMAN_RING_TYPE_CP1_INDEX].ready = false;
        rdev->ring[CAYMAN_RING_TYPE_CP2_INDEX].ready = false;
        /* this only test cp0 */
-       r = radeon_ring_test(rdev, &rdev->ring[RADEON_RING_TYPE_GFX_INDEX]);
+       r = radeon_ring_test(rdev, RADEON_RING_TYPE_GFX_INDEX, &rdev->ring[RADEON_RING_TYPE_GFX_INDEX]);
        if (r) {
                rdev->ring[RADEON_RING_TYPE_GFX_INDEX].ready = false;
                rdev->ring[CAYMAN_RING_TYPE_CP1_INDEX].ready = false;
@@ -1466,7 +1466,7 @@ static int cayman_startup(struct radeon_device *rdev)
        r = evergreen_blit_init(rdev);
        if (r) {
                r600_blit_fini(rdev);
-               rdev->asic->copy = NULL;
+               rdev->asic->copy.copy = NULL;
                dev_warn(rdev->dev, "failed blitter (%d) falling back to memcpy\n", r);
        }
 
@@ -1518,7 +1518,7 @@ static int cayman_startup(struct radeon_device *rdev)
        if (r)
                return r;
 
-       r = r600_ib_test(rdev, RADEON_RING_TYPE_GFX_INDEX);
+       r = radeon_ib_test(rdev, RADEON_RING_TYPE_GFX_INDEX, &rdev->ring[RADEON_RING_TYPE_GFX_INDEX]);
        if (r) {
                DRM_ERROR("radeon: failed testing IB (%d).\n", r);
                rdev->accel_working = false;