summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPekka Paalanen <pq@iki.fi>2007-10-12 23:43:31 +0300
committerPekka Paalanen <pq@iki.fi>2007-10-12 23:47:14 +0300
commit0d2554f83e72cae1bc44e476fbed4fc78873264f (patch)
treed37e60892c5b6c1913a58a45ec0e4d62e93e1a53
parent9d779e2c88a02f5f9d57618145654610f0f10e28 (diff)
nouveau: Make notifiers go into PCI memory
On some hardware notifers in AGP memory just don't work.
-rw-r--r--shared-core/nouveau_notifier.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/shared-core/nouveau_notifier.c b/shared-core/nouveau_notifier.c
index d3b79683..c361bc69 100644
--- a/shared-core/nouveau_notifier.c
+++ b/shared-core/nouveau_notifier.c
@@ -36,17 +36,8 @@ nouveau_notifier_init_channel(struct nouveau_channel *chan)
struct drm_nouveau_private *dev_priv = dev->dev_private;
int flags, ret;
- /*TODO: PCI notifier blocks */
-#ifndef __powerpc__
- if (dev_priv->agp_heap)
- flags = NOUVEAU_MEM_AGP;
- else
-#endif
- if (dev_priv->pci_heap)
- flags = NOUVEAU_MEM_PCI;
- else
- flags = NOUVEAU_MEM_FB;
- flags |= (NOUVEAU_MEM_MAPPED | NOUVEAU_MEM_FB_ACCEPTABLE);
+ flags = (NOUVEAU_MEM_PCI | NOUVEAU_MEM_MAPPED |
+ NOUVEAU_MEM_FB_ACCEPTABLE);
chan->notifier_block = nouveau_mem_alloc(dev, 0, PAGE_SIZE, flags,
(struct drm_file *)-2);