drm/radeon/kms: Fix R600/RV770 disable acceleration path

[net-next-2.6.git] / drivers / gpu / drm / radeon / rv770.c

diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c
index a06e7497d49ea82e57ee514c7408b7f647a3e444..a04e6ee459473ca3e5f974e0a114137d6bcf5bd0 100644 (file)
--- a/drivers/gpu/drm/radeon/rv770.c
+++ b/drivers/gpu/drm/radeon/rv770.c
@@ -968,6 +968,11 @@ int rv770_init(struct radeon_device *rdev)
                        rdev->flags &= ~RADEON_IS_AGP;
                        return rv770_init(rdev);
                }
+               rv770_suspend(rdev);
+               r600_wb_fini(rdev);
+               radeon_ib_pool_fini(rdev);
+               radeon_ring_fini(rdev);
+               rv770_pcie_gart_fini(rdev);
                rdev->accel_working = false;
        }
        if (rdev->accel_working) {