diff options
author | Jeff Hartmann <jhartmann@valinux.com> | 2000-04-04 22:08:14 +0000 |
---|---|---|
committer | Jeff Hartmann <jhartmann@valinux.com> | 2000-04-04 22:08:14 +0000 |
commit | ba1b1ae3806490cce16a9c8957b52cd74967f463 (patch) | |
tree | ec80e9e61fac3a0f1a0eafaedef239c419a89403 /linux/bufs.c | |
parent | 7d715d1800031ccbd37db7f88896464c0e838f10 (diff) |
Merged mga branch with trunk
Diffstat (limited to 'linux/bufs.c')
-rw-r--r-- | linux/bufs.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/linux/bufs.c b/linux/bufs.c index 85244c7d..7902f0cc 100644 --- a/linux/bufs.c +++ b/linux/bufs.c @@ -102,6 +102,11 @@ int drm_addmap(struct inode *inode, struct file *filp, unsigned int cmd, dev->lock.hw_lock = map->handle; /* Pointer to lock */ } break; +#ifdef DRM_AGP + case _DRM_AGP: + map->offset = map->offset + dev->agp->base; + break; +#endif default: drm_free(map, sizeof(*map), DRM_MEM_MAPS); return -EINVAL; @@ -172,7 +177,7 @@ int drm_addbufs(struct inode *inode, struct file *filp, unsigned int cmd, if (order < DRM_MIN_ORDER || order > DRM_MAX_ORDER) return -EINVAL; if (dev->queue_count) return -EBUSY; /* Not while in use */ - alignment = (request.flags & DRM_PAGE_ALIGN) ? PAGE_ALIGN(size) :size; + alignment = (request.flags & _DRM_PAGE_ALIGN) ? PAGE_ALIGN(size):size; page_order = order - PAGE_SHIFT > 0 ? order - PAGE_SHIFT : 0; total = PAGE_SIZE << page_order; |