aboutsummaryrefslogtreecommitdiff
path: root/linux-core/drm_memory.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2005-06-17 09:09:17 +0000
committerDave Airlie <airlied@linux.ie>2005-06-17 09:09:17 +0000
commit71df0eed3476d4430a59ce21ca641ac8eecf54e2 (patch)
tree1b49d7846e3ca3dc516afa126498920bb642c002 /linux-core/drm_memory.c
parent0569fe7a528e5e0753d9f72807a8f4310c6c9782 (diff)
fix up drm_alloc_agp to take a dev arg and not pass crappy agpgart around
Diffstat (limited to 'linux-core/drm_memory.c')
-rw-r--r--linux-core/drm_memory.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/linux-core/drm_memory.c b/linux-core/drm_memory.c
index 2cc3dc67..69610046 100644
--- a/linux-core/drm_memory.c
+++ b/linux-core/drm_memory.c
@@ -152,14 +152,14 @@ void drm_free_pages(unsigned long address, int order, int area)
#if __OS_HAS_AGP
/** Wrapper around agp_allocate_memory() */
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,11)
-DRM_AGP_MEM *drm_alloc_agp(int pages, u32 type)
+DRM_AGP_MEM *drm_alloc_agp(drm_device_t *dev, int pages, u32 type)
{
return drm_agp_allocate_memory(pages, type);
}
#else
-DRM_AGP_MEM *drm_alloc_agp(struct agp_bridge_data *bridge, int pages, u32 type)
+DRM_AGP_MEM *drm_alloc_agp(drm_device_t *dev, int pages, u32 type)
{
- return drm_agp_allocate_memory(bridge, pages, type);
+ return drm_agp_allocate_memory(dev->agp->bridge, pages, type);
}
#endif
EXPORT_SYMBOL(drm_alloc_agp);