aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Airlie <airlied@starflyer.(none)>2005-07-10 04:17:42 -0400
committerDave Airlie <airlied@linux.ie>2005-07-10 04:17:42 -0400
commitb5d499cfdeebcb71f00f3513045796ccae718140 (patch)
tree009eccb0fc8657fda446851f7c7df497ef3470b6
parent93f453f3ffd8f4dbb0311b58b854e7655da3d601 (diff)
drm: make drm_alloc_agp take a dev arg.
Signed-off-by: Dave Airlie <airlied@linux.ie>
-rw-r--r--drivers/char/drm/drmP.h2
-rw-r--r--drivers/char/drm/drm_agpsupport.c2
-rw-r--r--drivers/char/drm/drm_memory.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h
index a9b61864feba..a7fdcece6129 100644
--- a/drivers/char/drm/drmP.h
+++ b/drivers/char/drm/drmP.h
@@ -829,7 +829,7 @@ extern void *drm_ioremap_nocache(unsigned long offset, unsigned long size,
829 drm_device_t *dev); 829 drm_device_t *dev);
830extern void drm_ioremapfree(void *pt, unsigned long size, drm_device_t *dev); 830extern void drm_ioremapfree(void *pt, unsigned long size, drm_device_t *dev);
831 831
832extern DRM_AGP_MEM *drm_alloc_agp(struct agp_bridge_data *bridge, int pages, u32 type); 832extern DRM_AGP_MEM *drm_alloc_agp(drm_device_t *dev, int pages, u32 type);
833extern int drm_free_agp(DRM_AGP_MEM *handle, int pages); 833extern int drm_free_agp(DRM_AGP_MEM *handle, int pages);
834extern int drm_bind_agp(DRM_AGP_MEM *handle, unsigned int start); 834extern int drm_bind_agp(DRM_AGP_MEM *handle, unsigned int start);
835extern int drm_unbind_agp(DRM_AGP_MEM *handle); 835extern int drm_unbind_agp(DRM_AGP_MEM *handle);
diff --git a/drivers/char/drm/drm_agpsupport.c b/drivers/char/drm/drm_agpsupport.c
index d413da00329d..ffb4acaefe84 100644
--- a/drivers/char/drm/drm_agpsupport.c
+++ b/drivers/char/drm/drm_agpsupport.c
@@ -229,7 +229,7 @@ int drm_agp_alloc(struct inode *inode, struct file *filp,
229 pages = (request.size + PAGE_SIZE - 1) / PAGE_SIZE; 229 pages = (request.size + PAGE_SIZE - 1) / PAGE_SIZE;
230 type = (u32) request.type; 230 type = (u32) request.type;
231 231
232 if (!(memory = drm_alloc_agp(dev->agp->bridge, pages, type))) { 232 if (!(memory = drm_alloc_agp(dev, pages, type))) {
233 drm_free(entry, sizeof(*entry), DRM_MEM_AGPLISTS); 233 drm_free(entry, sizeof(*entry), DRM_MEM_AGPLISTS);
234 return -ENOMEM; 234 return -ENOMEM;
235 } 235 }
diff --git a/drivers/char/drm/drm_memory.c b/drivers/char/drm/drm_memory.c
index ef66494b854d..ff483fb418aa 100644
--- a/drivers/char/drm/drm_memory.c
+++ b/drivers/char/drm/drm_memory.c
@@ -142,9 +142,9 @@ void drm_free_pages(unsigned long address, int order, int area)
142 142
143#if __OS_HAS_AGP 143#if __OS_HAS_AGP
144/** Wrapper around agp_allocate_memory() */ 144/** Wrapper around agp_allocate_memory() */
145DRM_AGP_MEM *drm_alloc_agp(struct agp_bridge_data *bridge, int pages, u32 type) 145DRM_AGP_MEM *drm_alloc_agp(drm_device_t *dev, int pages, u32 type)
146{ 146{
147 return drm_agp_allocate_memory(bridge, pages, type); 147 return drm_agp_allocate_memory(dev->agp->bridge, pages, type);
148} 148}
149EXPORT_SYMBOL(drm_alloc_agp); 149EXPORT_SYMBOL(drm_alloc_agp);
150 150