---

yaml --- r: 174602 b: refs/heads/master c: 30256a3 h: refs/heads/master v: v3
git-mirror · Dec 2, 2009 · ae44a4c · ae44a4c
1 parent 2a8502a
commit ae44a4c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec51efa9b2b8ff10b535a853c293e85bada886e4
+refs/heads/master: 30256a3f6b646f6c6ab7276a97b40792faac5f1d
diff --git a/trunk/drivers/gpu/drm/radeon/radeon_device.c b/trunk/drivers/gpu/drm/radeon/radeon_device.c
@@ -553,7 +553,7 @@ int radeon_device_init(struct radeon_device *rdev,
 		return r;
 	}
 
-	if (radeon_agpmode == -1) {
+	if (rdev->flags & RADEON_IS_AGP && radeon_agpmode == -1) {
 		radeon_agp_disable(rdev);
 	}