summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Skeggs <skeggsb@gmail.com>2007-07-09 23:58:00 +1000
committerBen Skeggs <skeggsb@gmail.com>2007-07-09 23:58:00 +1000
commit023f7d9c0064f912415c92a85c3a9d722191909f (patch)
treeede9cad2e9bef02aa4949abbe82a30ede1c5ba54
parent31e33813e8c1b085683e68524e680882368e59a9 (diff)
nouveau: Allocate mappable VRAM for notifiers..
-rw-r--r--shared-core/nouveau_fifo.c4
-rw-r--r--shared-core/nouveau_notifier.c1
2 files changed, 1 insertions, 4 deletions
diff --git a/shared-core/nouveau_fifo.c b/shared-core/nouveau_fifo.c
index c140a634..4095a57f 100644
--- a/shared-core/nouveau_fifo.c
+++ b/shared-core/nouveau_fifo.c
@@ -497,10 +497,6 @@ static int nouveau_ioctl_fifo_alloc(DRM_IOCTL_ARGS)
/* and the notifier block */
init.notifier = chan->notifier_block->start;
init.notifier_size = chan->notifier_block->size;
- res = drm_addmap(dev, init.notifier, init.notifier_size, _DRM_REGISTERS,
- 0, &chan->notifier_map);
- if (res != 0)
- return res;
DRM_COPY_TO_USER_IOCTL((drm_nouveau_fifo_alloc_t __user *)data,
init, sizeof(init));
diff --git a/shared-core/nouveau_notifier.c b/shared-core/nouveau_notifier.c
index 9e792e57..30216293 100644
--- a/shared-core/nouveau_notifier.c
+++ b/shared-core/nouveau_notifier.c
@@ -41,6 +41,7 @@ nouveau_notifier_init_channel(drm_device_t *dev, int channel, DRMFILE filp)
flags = NOUVEAU_MEM_AGP | NOUVEAU_MEM_FB_ACCEPTABLE;
else
flags = NOUVEAU_MEM_FB;
+ flags |= NOUVEAU_MEM_MAPPED;
chan->notifier_block = nouveau_mem_alloc(dev, 0, PAGE_SIZE, flags,filp);
if (!chan->notifier_block)