diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2009-09-25 17:32:14 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2009-09-26 09:07:43 +1000 |
| commit | 2b5d6c538b48772ba3351b8a8eed096f7af8de5d (patch) | |
| tree | 163532c42500621837990cf68b566212f59f678f | |
| parent | c5e617e2f84225a28823a3e19951273b9f59eb27 (diff) | |
| download | op-kernel-dev-2b5d6c538b48772ba3351b8a8eed096f7af8de5d.zip op-kernel-dev-2b5d6c538b48772ba3351b8a8eed096f7af8de5d.tar.gz | |
drm/radeon/kms/r600: fix forcing pci mode on agp cards
All we need to do on r6xx/r7xx is clear the RADEON_IS_AGP
flag; the rest is handled in r600.c
fixes fdo bug 23990:
http://bugs.freedesktop.org/show_bug.cgi?id=23990
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@linux.ie>
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_device.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index 8a40c61..a6733cf 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c @@ -520,10 +520,13 @@ int radeon_device_init(struct radeon_device *rdev, if (radeon_agpmode == -1) { rdev->flags &= ~RADEON_IS_AGP; - if (rdev->family >= CHIP_RV515 || - rdev->family == CHIP_RV380 || - rdev->family == CHIP_RV410 || - rdev->family == CHIP_R423) { + if (rdev->family >= CHIP_R600) { + DRM_INFO("Forcing AGP to PCIE mode\n"); + rdev->flags |= RADEON_IS_PCIE; + } else if (rdev->family >= CHIP_RV515 || + rdev->family == CHIP_RV380 || + rdev->family == CHIP_RV410 || + rdev->family == CHIP_R423) { DRM_INFO("Forcing AGP to PCIE mode\n"); rdev->flags |= RADEON_IS_PCIE; rdev->asic->gart_init = &rv370_pcie_gart_init; |
