summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d3aa052)
raw | patch | inline | side by side (parent: d3aa052)
author | Dave Airlie <airlied@redhat.com> | |
Sun, 2 Nov 2008 23:51:57 +0000 (09:51 +1000) | ||
committer | Dave Airlie <airlied@redhat.com> | |
Sun, 2 Nov 2008 23:51:57 +0000 (09:51 +1000) |
shared-core/radeon_cp.c | patch | blob | history |
index 1c187b151e4af5724c77c0f57f6552d18156496b..71914782d2f1b3bdf89efc97f68ec4107552f954 100644 (file)
--- a/shared-core/radeon_cp.c
+++ b/shared-core/radeon_cp.c
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;
+ }
}