summaryrefslogtreecommitdiff
path: root/shared-core
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2008-11-03 09:51:57 +1000
committerDave Airlie <airlied@redhat.com>2008-11-03 09:51:57 +1000
commit2b9a7d5381534122858dc6e407794e8cd5c04d3e (patch)
tree0d8b4e2fe3fea931748d01d065bcfa99c63fb9db /shared-core
parentd3aa052f6174ea37136574b68ed55d7cb82c5017 (diff)
radeon: disable AGP for certain chips if not specified until we figure it out
Diffstat (limited to 'shared-core')
-rw-r--r--shared-core/radeon_cp.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/shared-core/radeon_cp.c b/shared-core/radeon_cp.c
index 1c187b15..71914782 100644
--- a/shared-core/radeon_cp.c
+++ b/shared-core/radeon_cp.c
@@ -2669,9 +2669,16 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags)
DRM_DEBUG("%s card detected\n",
((dev_priv->flags & RADEON_IS_AGP) ? "AGP" : (((dev_priv->flags & RADEON_IS_PCIE) ? "PCIE" : "PCI"))));
- if ((dev_priv->flags & RADEON_IS_AGP) && (radeon_agpmode == -1)) {
- DRM_INFO("Forcing AGP to PCI mode\n");
- dev_priv->flags &= ~RADEON_IS_AGP;
+ if (dev_priv->flags & RADEON_IS_AGP) {
+
+ /* disable AGP for any chips after RV280 if not specified */
+ if ((dev_priv->chip_family > CHIP_RV280) && (radeon_agpmode == 0))
+ radeon_agpmode = -1;
+
+ if (radeon_agpmode == -1) {
+ DRM_INFO("Forcing AGP to PCI mode\n");
+ dev_priv->flags &= ~RADEON_IS_AGP;
+ }
}