From 71df0eed3476d4430a59ce21ca641ac8eecf54e2 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Fri, 17 Jun 2005 09:09:17 +0000 Subject: fix up drm_alloc_agp to take a dev arg and not pass crappy agpgart around --- linux-core/drm_agpsupport.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'linux-core/drm_agpsupport.c') diff --git a/linux-core/drm_agpsupport.c b/linux-core/drm_agpsupport.c index 686efcc9..078c9127 100644 --- a/linux-core/drm_agpsupport.c +++ b/linux-core/drm_agpsupport.c @@ -251,17 +251,10 @@ int drm_agp_alloc(struct inode *inode, struct file *filp, pages = (request.size + PAGE_SIZE - 1) / PAGE_SIZE; type = (u32) request.type; -#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,11) - if (!(memory = drm_alloc_agp(pages, type))) { - drm_free(entry, sizeof(*entry), DRM_MEM_AGPLISTS); - return -ENOMEM; - } -#else - if (!(memory = drm_alloc_agp(dev->agp->bridge, pages, type))) { + if (!(memory = drm_alloc_agp(dev, pages, type))) { drm_free(entry, sizeof(*entry), DRM_MEM_AGPLISTS); return -ENOMEM; } -#endif entry->handle = (unsigned long)memory->key + 1; entry->memory = memory; -- cgit v1.2.3