Skip to contentSkip to conversation

ati_pcigart: simplify page_count manipulations

PATCH New Nick Piggin 1 participant 1 message Jan 18, 2006 Char and misc drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ati_pcigart: simplify page_count manipulations

Allocate a compound page for the user mapping instead of tweaking the page refcounts.

drivers/char/drm/ati_pcigart.c +4 -7
Index: linux-2.6/drivers/char/drm/ati_pcigart.c
===================================================================
@@ -59,17 +59,16 @@ static void *drm_ati_alloc_pcigart_table
 	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 0;
 	}
 
 	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(v
 
 	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);
 }