summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephane Marchesin <marchesin@icps.u-strasbg.fr>2007-11-01 15:48:46 +0100
committerStephane Marchesin <marchesin@icps.u-strasbg.fr>2007-11-01 15:49:10 +0100
commit5766d81074d6faa7f14b45635765cdb7209597fc (patch)
treede91c2ffc78f6a10301848b562e3aee13dfc5128
parent1b176e76134224e2af94d24ff7b33c7b536eaeea (diff)
nouveau: don't use AGP on PPC. It's a hopeless case.
-rw-r--r--shared-core/nouveau_mem.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/shared-core/nouveau_mem.c b/shared-core/nouveau_mem.c
index 448b69d3..0e73c149 100644
--- a/shared-core/nouveau_mem.c
+++ b/shared-core/nouveau_mem.c
@@ -392,11 +392,13 @@ int nouveau_mem_init(struct drm_device *dev)
dev_priv->fb_nomap_heap=NULL;
}
+#ifndef __powerpc__
/* Init AGP / NV50 PCIEGART */
if (drm_device_is_agp(dev) && dev->agp) {
if ((ret = nouveau_mem_init_agp(dev)))
DRM_ERROR("Error initialising AGP: %d\n", ret);
}
+#endif
/*Note: this is *not* just NV50 code, but only used on NV50 for now */
if (dev_priv->gart_info.type == NOUVEAU_GART_NONE &&