diff options
| author | Dave Airlie <airlied@linux.ie> | 2005-06-17 09:09:17 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2005-06-17 09:09:17 +0000 |
| commit | 71df0eed3476d4430a59ce21ca641ac8eecf54e2 (patch) | |
| tree | 1b49d7846e3ca3dc516afa126498920bb642c002 /linux-core/drm_agpsupport.c | |
| parent | 0569fe7a528e5e0753d9f72807a8f4310c6c9782 (diff) | |
fix up drm_alloc_agp to take a dev arg and not pass crappy agpgart around
Diffstat (limited to 'linux-core/drm_agpsupport.c')
| -rw-r--r-- | linux-core/drm_agpsupport.c | 9 |
1 files changed, 1 insertions, 8 deletions
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; |