Merge branch 'fix/soundcore' into for-linus

[pandora-kernel.git] / drivers / char / agp / generic.c

diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c
index 2224b76..1e8b461 100644 (file)
--- a/drivers/char/agp/generic.c
+++ b/drivers/char/agp/generic.c
@@ -95,13 +95,13 @@ EXPORT_SYMBOL(agp_flush_chipset);
 
 void agp_alloc_page_array(size_t size, struct agp_memory *mem)
 {
-       mem->memory = NULL;
+       mem->pages = NULL;
        mem->vmalloc_flag = false;
 
        if (size <= 2*PAGE_SIZE)
-               mem->memory = kmalloc(size, GFP_KERNEL | __GFP_NORETRY);
-       if (mem->memory == NULL) {
-               mem->memory = vmalloc(size);
+               mem->pages = kmalloc(size, GFP_KERNEL | __GFP_NORETRY);
+       if (mem->pages == NULL) {
+               mem->pages = vmalloc(size);
                mem->vmalloc_flag = true;
        }
 }
@@ -110,9 +110,9 @@ EXPORT_SYMBOL(agp_alloc_page_array);
 void agp_free_page_array(struct agp_memory *mem)
 {
        if (mem->vmalloc_flag) {
-               vfree(mem->memory);
+               vfree(mem->pages);
        } else {
-               kfree(mem->memory);
+               kfree(mem->pages);
        }
 }
 EXPORT_SYMBOL(agp_free_page_array);
@@ -136,7 +136,7 @@ static struct agp_memory *agp_create_user_memory(unsigned long num_agp_pages)
 
        agp_alloc_page_array(alloc_size, new);
 
-       if (new->memory == NULL) {
+       if (new->pages == NULL) {
                agp_free_key(new->key);
                kfree(new);
                return NULL;
@@ -162,7 +162,7 @@ struct agp_memory *agp_create_memory(int scratch_pages)
 
        agp_alloc_page_array(PAGE_SIZE * scratch_pages, new);
 
-       if (new->memory == NULL) {
+       if (new->pages == NULL) {
                agp_free_key(new->key);
                kfree(new);
                return NULL;
@@ -206,15 +206,13 @@ void agp_free_memory(struct agp_memory *curr)
                } else {
 
                        for (i = 0; i < curr->page_count; i++) {
-                               curr->memory[i] = (unsigned long)gart_to_virt(
-                                       curr->memory[i]);
                                curr->bridge->driver->agp_destroy_page(
-                                       (void *)curr->memory[i],
+                                       curr->pages[i],
                                        AGP_PAGE_DESTROY_UNMAP);
                        }
                        for (i = 0; i < curr->page_count; i++) {
                                curr->bridge->driver->agp_destroy_page(
-                                       (void *)curr->memory[i],
+                                       curr->pages[i],
                                        AGP_PAGE_DESTROY_FREE);
                        }
                }
@@ -282,13 +280,13 @@ struct agp_memory *agp_allocate_memory(struct agp_bridge_data *bridge,
        }
 
        for (i = 0; i < page_count; i++) {
-               void *addr = bridge->driver->agp_alloc_page(bridge);
+               struct page *page = bridge->driver->agp_alloc_page(bridge);
 
-               if (addr == NULL) {
+               if (page == NULL) {
                        agp_free_memory(new);
                        return NULL;
                }
-               new->memory[i] = virt_to_gart(addr);
+               new->pages[i] = page;
                new->page_count++;
        }
        new->bridge = bridge;
@@ -1134,7 +1132,7 @@ int agp_generic_insert_memory(struct agp_memory * mem, off_t pg_start, int type)
        }
 
        for (i = 0, j = pg_start; i < mem->page_count; i++, j++) {
-               writel(bridge->driver->mask_memory(bridge, mem->memory[i], mask_type),
+               writel(bridge->driver->mask_memory(bridge, mem->pages[i], mask_type),
                       bridge->gatt_table+j);
        }
        readl(bridge->gatt_table+j-1);  /* PCI Posting. */
@@ -1204,7 +1202,7 @@ struct agp_memory *agp_generic_alloc_user(size_t page_count, int type)
                return NULL;
 
        for (i = 0; i < page_count; i++)
-               new->memory[i] = 0;
+               new->pages[i] = 0;
        new->page_count = 0;
        new->type = type;
        new->num_scratch_pages = pages;
@@ -1237,23 +1235,20 @@ int agp_generic_alloc_pages(struct agp_bridge_data *bridge, struct agp_memory *m
                get_page(page);
                atomic_inc(&agp_bridge->current_memory_agp);
 
-               /* set_memory_array_uc() needs virtual address */
-               mem->memory[i] = (unsigned long)page_address(page);
+               mem->pages[i] = page;
                mem->page_count++;
        }
 
 #ifdef CONFIG_X86
-       set_memory_array_uc(mem->memory, num_pages);
+       set_pages_array_uc(mem->pages, num_pages);
 #endif
        ret = 0;
 out:
-       for (i = 0; i < mem->page_count; i++)
-               mem->memory[i] = virt_to_gart((void *)mem->memory[i]);
        return ret;
 }
 EXPORT_SYMBOL(agp_generic_alloc_pages);
 
-void *agp_generic_alloc_page(struct agp_bridge_data *bridge)
+struct page *agp_generic_alloc_page(struct agp_bridge_data *bridge)
 {
        struct page * page;
 
@@ -1265,56 +1260,47 @@ void *agp_generic_alloc_page(struct agp_bridge_data *bridge)
 
        get_page(page);
        atomic_inc(&agp_bridge->current_memory_agp);
-       return page_address(page);
+       return page;
 }
 EXPORT_SYMBOL(agp_generic_alloc_page);
 
 void agp_generic_destroy_pages(struct agp_memory *mem)
 {
        int i;
-       void *addr;
        struct page *page;
 
        if (!mem)
                return;
 
-       for (i = 0; i < mem->page_count; i++)
-               mem->memory[i] = (unsigned long)gart_to_virt(mem->memory[i]);
-
 #ifdef CONFIG_X86
-       set_memory_array_wb(mem->memory, mem->page_count);
+       set_pages_array_wb(mem->pages, mem->page_count);
 #endif
 
        for (i = 0; i < mem->page_count; i++) {
-               addr = (void *)mem->memory[i];
-               page = virt_to_page(addr);
+               page = mem->pages[i];
 
 #ifndef CONFIG_X86
                unmap_page_from_agp(page);
 #endif
-
                put_page(page);
-               free_page((unsigned long)addr);
+               __free_page(page);
                atomic_dec(&agp_bridge->current_memory_agp);
-               mem->memory[i] = 0;
+               mem->pages[i] = NULL;
        }
 }
 EXPORT_SYMBOL(agp_generic_destroy_pages);
 
-void agp_generic_destroy_page(void *addr, int flags)
+void agp_generic_destroy_page(struct page *page, int flags)
 {
-       struct page *page;
-
-       if (addr == NULL)
+       if (page == NULL)
                return;
 
-       page = virt_to_page(addr);
        if (flags & AGP_PAGE_DESTROY_UNMAP)
                unmap_page_from_agp(page);
 
        if (flags & AGP_PAGE_DESTROY_FREE) {
                put_page(page);
-               free_page((unsigned long)addr);
+               __free_page(page);
                atomic_dec(&agp_bridge->current_memory_agp);
        }
 }
@@ -1361,8 +1347,9 @@ void global_cache_flush(void)
 EXPORT_SYMBOL(global_cache_flush);
 
 unsigned long agp_generic_mask_memory(struct agp_bridge_data *bridge,
-       unsigned long addr, int type)
+                                     struct page *page, int type)
 {
+       unsigned long addr = phys_to_gart(page_to_phys(page));
        /* memory type is ignored in the generic routine */
        if (bridge->driver->masks)
                return addr | bridge->driver->masks[0].mask;