1 files changed, 29 insertions, 7 deletions

diff --git a/drivers/char/agp/backend.c b/drivers/char/agp/backend.c
index cfa5a649dfe7..a56ca080e108 100644
--- a/drivers/char/agp/backend.c
+++ b/drivers/char/agp/backend.c
@@ -114,9 +114,9 @@ static int agp_find_max(void)
         long memory, index, result;
 
 #if PAGE_SHIFT < 20
-        memory = num_physpages >> (20 - PAGE_SHIFT);
+        memory = totalram_pages >> (20 - PAGE_SHIFT);
 #else
-        memory = num_physpages << (PAGE_SHIFT - 20);
+        memory = totalram_pages << (PAGE_SHIFT - 20);
 #endif
         index = 1;
 
@@ -149,9 +149,21 @@ static int agp_backend_initialize(struct agp_bridge_data *bridge)
                         return -ENOMEM;
                 }
 
-                bridge->scratch_page_real = phys_to_gart(page_to_phys(page));
-                bridge->scratch_page =
-                    bridge->driver->mask_memory(bridge, page, 0);
+                bridge->scratch_page_page = page;
+                if (bridge->driver->agp_map_page) {
+                        if (bridge->driver->agp_map_page(page,
+                                                         &bridge->scratch_page_dma)) {
+                                dev_err(&bridge->dev->dev,
+                                        "unable to dma-map scratch page\n");
+                                rc = -ENOMEM;
+                                goto err_out_nounmap;
+                        }
+                } else {
+                        bridge->scratch_page_dma = page_to_phys(page);
+                }
+
+                bridge->scratch_page = bridge->driver->mask_memory(bridge,
+                                                   bridge->scratch_page_dma, 0);
         }
 
         size_value = bridge->driver->fetch_size();
@@ -191,8 +203,14 @@ static int agp_backend_initialize(struct agp_bridge_data *bridge)
         return 0;
 
 err_out:
+        if (bridge->driver->needs_scratch_page &&
+            bridge->driver->agp_unmap_page) {
+                bridge->driver->agp_unmap_page(bridge->scratch_page_page,
+                                               bridge->scratch_page_dma);
+        }
+err_out_nounmap:
         if (bridge->driver->needs_scratch_page) {
-                void *va = gart_to_virt(bridge->scratch_page_real);
+                void *va = page_address(bridge->scratch_page_page);
 
                 bridge->driver->agp_destroy_page(va, AGP_PAGE_DESTROY_UNMAP);
                 bridge->driver->agp_destroy_page(va, AGP_PAGE_DESTROY_FREE);
@@ -219,7 +237,11 @@ static void agp_backend_cleanup(struct agp_bridge_data *bridge)
 
         if (bridge->driver->agp_destroy_page &&
             bridge->driver->needs_scratch_page) {
-                void *va = gart_to_virt(bridge->scratch_page_real);
+                void *va = page_address(bridge->scratch_page_page);
+
+                if (bridge->driver->agp_unmap_page)
+                        bridge->driver->agp_unmap_page(bridge->scratch_page_page,
+                                                       bridge->scratch_page_dma);
 
                 bridge->driver->agp_destroy_page(va, AGP_PAGE_DESTROY_UNMAP);
                 bridge->driver->agp_destroy_page(va, AGP_PAGE_DESTROY_FREE);