drm/radeon/kms: never treat rs4xx as AGP

Commit Message

Alex Deucher March 21, 2010, 3:56 p.m. UTC

None

Patch

diff --git a/drivers/gpu/drm/radeon/radeon_device.c
b/drivers/gpu/drm/radeon/radeon_device.c
index 75f7b1e..8de9edd 100644
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -563,6 +563,14 @@  int radeon_device_init(struct radeon_device *rdev,
 		return r;
 	radeon_check_arguments(rdev);

+	/* all of the newer IGP chips have an internal gart
+	 * However some rs4xx report as AGP, so remove that here.
+	 */
+	if ((rdev->family >= CHIP_RS400) &&
+	    (rdev->flags & RADEON_IS_AGP)) {
+		rdev->flags &= ~RADEON_IS_AGP;
+	}
+
 	if (rdev->flags & RADEON_IS_AGP && radeon_agpmode == -1) {
 		radeon_agp_disable(rdev);
 	}