---

yaml --- r: 209807 b: refs/heads/master c: e57415d h: refs/heads/master i: 209805: 1c27ecc 209803: 0d58a78 209799: 7639938 209791: a7e46a4 v: v3
git-mirror · Aug 19, 2010 · 1cc9aca · 1cc9aca
1 parent 632e06c
commit 1cc9aca
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 09f0c489fa115a8b88a2da3edd0f3de00c8c7e2e
+refs/heads/master: e57415d85f72e36029b75fdb556c95fb5346b692
diff --git a/trunk/drivers/gpu/drm/radeon/radeon_agp.c b/trunk/drivers/gpu/drm/radeon/radeon_agp.c
@@ -156,7 +156,13 @@ int radeon_agp_init(struct radeon_device *rdev)
 	}
 
 	mode.mode = info.mode;
-	agp_status = (RREG32(RADEON_AGP_STATUS) | RADEON_AGPv3_MODE) & mode.mode;
+	/* chips with the agp to pcie bridge don't have the AGP_STATUS register
+	 * Just use the whatever mode the host sets up.
+	 */
+	if (rdev->family <= CHIP_RV350)
+		agp_status = (RREG32(RADEON_AGP_STATUS) | RADEON_AGPv3_MODE) & mode.mode;
+	else
+		agp_status = mode.mode;
 	is_v3 = !!(agp_status & RADEON_AGPv3_MODE);
 
 	if (is_v3) {