intel-agp.c (56ec4c1e72865c6d99f643b6574e6e074c3e8823) intel-agp.c (c2980d8c2961113f24863f70d8ad016f55224c81)
1/*
2 * Intel AGPGART routines.
3 */
4
5#include <linux/module.h>
6#include <linux/pci.h>
7#include <linux/init.h>
8#include <linux/kernel.h>

--- 167 unchanged lines hidden (view full) ---

176 void *i8xx_flush_page;
177 };
178 struct page *i8xx_page;
179 struct resource ifp_resource;
180 int resource_valid;
181} intel_private;
182
183#ifdef USE_PCI_DMA_API
1/*
2 * Intel AGPGART routines.
3 */
4
5#include <linux/module.h>
6#include <linux/pci.h>
7#include <linux/init.h>
8#include <linux/kernel.h>

--- 167 unchanged lines hidden (view full) ---

176 void *i8xx_flush_page;
177 };
178 struct page *i8xx_page;
179 struct resource ifp_resource;
180 int resource_valid;
181} intel_private;
182
183#ifdef USE_PCI_DMA_API
184static int intel_agp_map_page(void *addr, dma_addr_t *ret)
184static int intel_agp_map_page(struct page *page, dma_addr_t *ret)
185{
185{
186 *ret = pci_map_single(intel_private.pcidev, addr,
187 PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
186 *ret = pci_map_page(intel_private.pcidev, page, 0,
187 PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
188 if (pci_dma_mapping_error(intel_private.pcidev, *ret))
189 return -EINVAL;
190 return 0;
191}
192
188 if (pci_dma_mapping_error(intel_private.pcidev, *ret))
189 return -EINVAL;
190 return 0;
191}
192
193static void intel_agp_unmap_page(void *addr, dma_addr_t dma)
193static void intel_agp_unmap_page(struct page *page, dma_addr_t dma)
194{
194{
195 pci_unmap_single(intel_private.pcidev, dma,
196 PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
195 pci_unmap_page(intel_private.pcidev, dma,
196 PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
197}
198
199static int intel_agp_map_memory(struct agp_memory *mem)
200{
201 struct scatterlist *sg;
202 int i;
203
204 DBG("try mapping %lu pages\n", (unsigned long)mem->page_count);

--- 2374 unchanged lines hidden --- 		197}
198
199static int intel_agp_map_memory(struct agp_memory *mem)
200{
201 struct scatterlist *sg;
202 int i;
203
204 DBG("try mapping %lu pages\n", (unsigned long)mem->page_count);

--- 2374 unchanged lines hidden ---