From 1cc9aca44a43034e85da92673d34cb3a8de97540 Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Wed, 18 Aug 2010 13:34:11 -0400 Subject: [PATCH] --- yaml --- r: 209807 b: refs/heads/master c: e57415d85f72e36029b75fdb556c95fb5346b692 h: refs/heads/master i: 209805: 1c27ecc4280971b8a5b2b29ac6db53fecb421daa 209803: 0d58a78f18f142c0fab6215ca517c055ebc8b05e 209799: 76399383f417107158a9b3408f68cbe4d62f61c2 209791: a7e46a4f4e72c8832068d32ff29e402774cb64f1 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/radeon_agp.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e67e911a23ab..6e7d882cd033 100644 --- 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 index f40dfb77f9b1..bd2f33e5c91a 100644 --- 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) {