Commit 2b5d6c53 authored by Alex Deucher's avatar Alex Deucher Committed by Dave Airlie

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=23990Signed-off-by: default avatarAlex Deucher <alexdeucher@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent c5e617e2
...@@ -520,10 +520,13 @@ int radeon_device_init(struct radeon_device *rdev, ...@@ -520,10 +520,13 @@ int radeon_device_init(struct radeon_device *rdev,
if (radeon_agpmode == -1) { if (radeon_agpmode == -1) {
rdev->flags &= ~RADEON_IS_AGP; rdev->flags &= ~RADEON_IS_AGP;
if (rdev->family >= CHIP_RV515 || if (rdev->family >= CHIP_R600) {
rdev->family == CHIP_RV380 || DRM_INFO("Forcing AGP to PCIE mode\n");
rdev->family == CHIP_RV410 || rdev->flags |= RADEON_IS_PCIE;
rdev->family == CHIP_R423) { } 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"); DRM_INFO("Forcing AGP to PCIE mode\n");
rdev->flags |= RADEON_IS_PCIE; rdev->flags |= RADEON_IS_PCIE;
rdev->asic->gart_init = &rv370_pcie_gart_init; rdev->asic->gart_init = &rv370_pcie_gart_init;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment