diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
index 8a40c61..71d7800 100644
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -520,27 +520,32 @@ int radeon_device_init(struct radeon_device *rdev,
 
 	if (radeon_agpmode == -1) {
 		rdev->flags &= ~RADEON_IS_AGP;
-		if (rdev->family >= CHIP_RV515 ||
-		    rdev->family == CHIP_RV380 ||
-		    rdev->family == CHIP_RV410 ||
-		    rdev->family == CHIP_R423) {
+		if (rdev->family < CHIP_R600) {
+			if (rdev->family >= CHIP_RV515 ||
+			    rdev->family == CHIP_RV380 ||
+			    rdev->family == CHIP_RV410 ||
+			    rdev->family == CHIP_R423) {
+				DRM_INFO("Forcing AGP to PCIE mode\n");
+				rdev->flags |= RADEON_IS_PCIE;
+				rdev->asic->gart_init = &rv370_pcie_gart_init;
+				rdev->asic->gart_fini = &rv370_pcie_gart_fini;
+				rdev->asic->gart_enable = &rv370_pcie_gart_enable;
+				rdev->asic->gart_disable = &rv370_pcie_gart_disable;
+				rdev->asic->gart_tlb_flush = &rv370_pcie_gart_tlb_flush;
+				rdev->asic->gart_set_page = &rv370_pcie_gart_set_page;
+			} else {
+				DRM_INFO("Forcing AGP to PCI mode\n");
+				rdev->flags |= RADEON_IS_PCI;
+				rdev->asic->gart_init = &r100_pci_gart_init;
+				rdev->asic->gart_fini = &r100_pci_gart_fini;
+				rdev->asic->gart_enable = &r100_pci_gart_enable;
+				rdev->asic->gart_disable = &r100_pci_gart_disable;
+				rdev->asic->gart_tlb_flush = &r100_pci_gart_tlb_flush;
+				rdev->asic->gart_set_page = &r100_pci_gart_set_page;
+			}
+		} else {
 			DRM_INFO("Forcing AGP to PCIE mode\n");
 			rdev->flags |= RADEON_IS_PCIE;
-			rdev->asic->gart_init = &rv370_pcie_gart_init;
-			rdev->asic->gart_fini = &rv370_pcie_gart_fini;
-			rdev->asic->gart_enable = &rv370_pcie_gart_enable;
-			rdev->asic->gart_disable = &rv370_pcie_gart_disable;
-			rdev->asic->gart_tlb_flush = &rv370_pcie_gart_tlb_flush;
-			rdev->asic->gart_set_page = &rv370_pcie_gart_set_page;
-		} else {
-			DRM_INFO("Forcing AGP to PCI mode\n");
-			rdev->flags |= RADEON_IS_PCI;
-			rdev->asic->gart_init = &r100_pci_gart_init;
-			rdev->asic->gart_fini = &r100_pci_gart_fini;
-			rdev->asic->gart_enable = &r100_pci_gart_enable;
-			rdev->asic->gart_disable = &r100_pci_gart_disable;
-			rdev->asic->gart_tlb_flush = &r100_pci_gart_tlb_flush;
-			rdev->asic->gart_set_page = &r100_pci_gart_set_page;
 		}
 	}