agp: switch AGP to use page array instead of unsigned long array

This switches AGP to use an array of pages for tracking the
pages allocated to the GART. This should enable GEM on PAE to work
a lot better as we can pass highmem pages to the PAT code and it will
do the right thing with them.

Signed-off-by: Dave Airlie <airlied@redhat.com>

4 files changed, 8 insertions, 9 deletions

diff --git a/drivers/gpu/drm/drm_agpsupport.c b/drivers/gpu/drm/drm_agpsupport.c
index 7a0d042c8d6a..d68888fe3df9 100644
--- a/drivers/gpu/drm/drm_agpsupport.c
+++ b/drivers/gpu/drm/drm_agpsupport.c
@@ -482,7 +482,7 @@ drm_agp_bind_pages(struct drm_device *dev,
         }
 
         for (i = 0; i < num_pages; i++)
-                mem->memory[i] = phys_to_gart(page_to_phys(pages[i]));
+                mem->pages[i] = pages[i];
         mem->page_count = num_pages;
 
         mem->is_flushed = true;
diff --git a/drivers/gpu/drm/drm_memory.c b/drivers/gpu/drm/drm_memory.c
index 0a436184dd88..e4865f99989c 100644
--- a/drivers/gpu/drm/drm_memory.c
+++ b/drivers/gpu/drm/drm_memory.c
@@ -59,10 +59,11 @@ int drm_mem_info(char *buf, char **start, off_t offset,
 static void *agp_remap(unsigned long offset, unsigned long size,
                        struct drm_device * dev)
 {
-        unsigned long *phys_addr_map, i, num_pages =
+        unsigned long i, num_pages =
             PAGE_ALIGN(size) / PAGE_SIZE;
         struct drm_agp_mem *agpmem;
         struct page **page_map;
+        struct page **phys_page_map;
         void *addr;
 
         size = PAGE_ALIGN(size);
@@ -89,10 +90,9 @@ static void *agp_remap(unsigned long offset, unsigned long size,
         if (!page_map)
                 return NULL;
 
-        phys_addr_map =
-            agpmem->memory->memory + (offset - agpmem->bound) / PAGE_SIZE;
+        phys_page_map = (agpmem->memory->pages + (offset - agpmem->bound) / PAGE_SIZE);
         for (i = 0; i < num_pages; ++i)
-                page_map[i] = pfn_to_page(phys_addr_map[i] >> PAGE_SHIFT);
+                page_map[i] = phys_page_map[i];
         addr = vmap(page_map, num_pages, VM_IOREMAP, PAGE_AGP);
         vfree(page_map);
 
diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c
index f95d03ac9784..7e1fbe5d4779 100644
--- a/drivers/gpu/drm/drm_vm.c
+++ b/drivers/gpu/drm/drm_vm.c
@@ -144,14 +144,14 @@ static int drm_do_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
                  * Get the page, inc the use count, and return it
                  */
                 offset = (baddr - agpmem->bound) >> PAGE_SHIFT;
-                page = virt_to_page(__va(agpmem->memory->memory[offset]));
+                page = agpmem->memory->pages[offset];
                 get_page(page);
                 vmf->page = page;
 
                 DRM_DEBUG
                     ("baddr = 0x%llx page = 0x%p, offset = 0x%llx, count=%d\n",
                      (unsigned long long)baddr,
-                     __va(agpmem->memory->memory[offset]),
+                     agpmem->memory->pages[offset],
                      (unsigned long long)offset,
                      page_count(page));
                 return 0;
diff --git a/drivers/gpu/drm/ttm/ttm_agp_backend.c b/drivers/gpu/drm/ttm/ttm_agp_backend.c
index e8f6d2229d8c..4648ed2f0143 100644
--- a/drivers/gpu/drm/ttm/ttm_agp_backend.c
+++ b/drivers/gpu/drm/ttm/ttm_agp_backend.c
@@ -63,8 +63,7 @@ static int ttm_agp_populate(struct ttm_backend *backend,
                 if (!page)
                         page = dummy_read_page;
 
-                mem->memory[mem->page_count++] =
-                    phys_to_gart(page_to_phys(page));
+                mem->pages[mem->page_count++] = page;
         }
         agp_be->mem = mem;
         return 0;