Messages in this thread Patch in this message | | | From | Konrad Rzeszutek Wilk <> | Subject | [PATCH 22/23] ia64/agp: Make agp_generic_* use PCI API. | Date | Mon, 6 Dec 2010 18:24:34 -0500 |
| |
We turn the PCI API on for IA64 AGP drivers. This means that any calls to: agp_generic_insert_memory agp_generic_create_gatt_table agp_generic_free_gatt_table agp_generic_alloc_pages agp_generic_alloc_page agp_generic_destroy_pages agp_generic_destroy_page
Will have the 'struct agp_memory' variable dma_addr filled with the DMA (bus) address of the page. For agp_generic_[alloc|destroy]_page it requires that the DMA (bus) address be passed in as extra argument.
Note: This change goes only effects the IA64 platforms. All other ones would still be using the old mechanism.
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> --- arch/ia64/include/asm/agp.h | 31 ++++++++++++++++++++----------- 1 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/arch/ia64/include/asm/agp.h b/arch/ia64/include/asm/agp.h index 9107e97..62abc81 100644 --- a/arch/ia64/include/asm/agp.h +++ b/arch/ia64/include/asm/agp.h @@ -19,23 +19,32 @@ /* GATT allocation. Returns/accepts GATT kernel virtual address. */ #define alloc_gatt_pages(bridge, order) \ - ((char *)__get_free_pages(GFP_KERNEL, (order))) + ({ \ + pci_alloc_consistent(bridge->dev, \ + PAGE_SIZE * (1 << order), \ + (dma_addr_t *)&bridge->gatt_bus_addr); \ + }) #define free_gatt_pages(bridge, order) \ - free_pages((unsigned long)(bridge->gatt_table_real), (order)) + pci_free_consistent(bridge->dev, bridge->gatt_table_size, \ + bridge->gatt_table_real, \ + bridge->gatt_bus_addr); /* pages allocation. */ #define _agp_alloc_page(bridge, dma_addr) \ ({ \ - struct page *_page = NULL; \ - _page = alloc_page(GFP_KERNEL | GFP_DMA32 | __GFP_ZERO); \ - if (_page) \ - *dma_addr = page_to_phys(_page); \ + void *_addr = NULL; \ + struct page * _page = NULL;\ + _addr = pci_alloc_consistent(bridge->dev, PAGE_SIZE, \ + dma_addr); \ + if (_addr) \ + _page = virt_to_page(_addr); \ _page; \ }) #define _agp_free_page(bridge, page, dma_addr) \ - ({ \ - __free_page(page); \ - *dma_addr = DMA_ERROR_CODE; \ - }) - + ({ \ + void *_addr = NULL; \ + _addr = page_address(page); \ + pci_free_consistent(bridge->dev, PAGE_SIZE, _addr, *dma_addr); \ + *dma_addr = DMA_ERROR_CODE; \ + }) #endif /* _ASM_IA64_AGP_H */ -- 1.7.1
| |