diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2006-01-25 14:58:58 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-01-25 14:58:58 +1100 |
| commit | 507d256bae9eef7acd5049af6e3f67c24904a1e4 (patch) | |
| tree | 25c3467fc38a9b991b8209ad4a6a92c035fcb26d /drivers/char/drm | |
| parent | f1e5c03d34c39394781ae13543cd3355976e4812 (diff) | |
| download | op-kernel-dev-507d256bae9eef7acd5049af6e3f67c24904a1e4.zip op-kernel-dev-507d256bae9eef7acd5049af6e3f67c24904a1e4.tar.gz | |
drm: ati_pcigart: simplify page_count manipulations
From: Nick Piggin <npiggin@suse.de>
Allocate a compound page for the user mapping instead of tweaking the page
refcounts.
Signed-off-by: Nick Piggin <npiggin@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm')
| -rw-r--r-- | drivers/char/drm/ati_pcigart.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/char/drm/ati_pcigart.c b/drivers/char/drm/ati_pcigart.c index 7d2a885..bd7be09 100644 --- a/drivers/char/drm/ati_pcigart.c +++ b/drivers/char/drm/ati_pcigart.c @@ -59,17 +59,16 @@ static void *drm_ati_alloc_pcigart_table(void) int i; DRM_DEBUG("%s\n", __FUNCTION__); - address = __get_free_pages(GFP_KERNEL, ATI_PCIGART_TABLE_ORDER); + address = __get_free_pages(GFP_KERNEL | __GFP_COMP, + ATI_PCIGART_TABLE_ORDER); if (address == 0UL) { return NULL; } page = virt_to_page(address); - for (i = 0; i < ATI_PCIGART_TABLE_PAGES; i++, page++) { - get_page(page); + for (i = 0; i < ATI_PCIGART_TABLE_PAGES; i++, page++) SetPageReserved(page); - } DRM_DEBUG("%s: returning 0x%08lx\n", __FUNCTION__, address); return (void *)address; @@ -83,10 +82,8 @@ static void drm_ati_free_pcigart_table(void *address) page = virt_to_page((unsigned long)address); - for (i = 0; i < ATI_PCIGART_TABLE_PAGES; i++, page++) { - __put_page(page); + for (i = 0; i < ATI_PCIGART_TABLE_PAGES; i++, page++) ClearPageReserved(page); - } free_pages((unsigned long)address, ATI_PCIGART_TABLE_ORDER); } |
