diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
index 3d66703..a73e0b0 100644
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -548,6 +548,11 @@ int radeon_device_init(struct radeon_device *rdev,
 		return r;
 	}
 
+	if (RADEON_IS_AGP && !rdev->ddev->agp){
+		printk(KERN_WARNING "radeon: AGP selected but not available, disabling.\n");
+		radeon_agp_disable(rdev);
+	}
+
 	if (radeon_agpmode == -1) {
 		radeon_agp_disable(rdev);
 	}