1 files changed, 2 insertions, 8 deletions

diff --git a/drivers/gpu/drm/radeon/rs400.c b/drivers/gpu/drm/radeon/rs400.c
index f454c9a5e7f2..ae2b76b9a388 100644
--- a/drivers/gpu/drm/radeon/rs400.c
+++ b/drivers/gpu/drm/radeon/rs400.c
@@ -55,14 +55,6 @@ void rs400_gart_adjust_size(struct radeon_device *rdev)
                 rdev->mc.gtt_size = 32 * 1024 * 1024;
                 return;
         }
-        if (rdev->family == CHIP_RS400 || rdev->family == CHIP_RS480) {
-                /* FIXME: RS400 & RS480 seems to have issue with GART size
-                 * if 4G of system memory (needs more testing)
-                 */
-                /* XXX is this still an issue with proper alignment? */
-                rdev->mc.gtt_size = 32 * 1024 * 1024;
-                DRM_ERROR("Forcing to 32M GART size (because of ASIC bug ?)\n");
-        }
 }
 
 void rs400_gart_tlb_flush(struct radeon_device *rdev)
@@ -483,6 +475,8 @@ int rs400_init(struct radeon_device *rdev)
         /* Initialize surface registers */
         radeon_surface_init(rdev);
         /* TODO: disable VGA need to use VGA request */
+        /* restore some register to sane defaults */
+        r100_restore_sanity(rdev);
         /* BIOS*/
         if (!radeon_get_bios(rdev)) {
                 if (ASIC_IS_AVIVO(rdev))