1 files changed, 31 insertions, 13 deletions

diff --git a/drivers/gpu/drm/radeon/radeon_gart.c b/drivers/gpu/drm/radeon/radeon_gart.c
index e65b90317fab..a533f52fd163 100644
--- a/drivers/gpu/drm/radeon/radeon_gart.c
+++ b/drivers/gpu/drm/radeon/radeon_gart.c
@@ -78,9 +78,9 @@ int radeon_gart_table_vram_alloc(struct radeon_device *rdev)
         int r;
 
         if (rdev->gart.table.vram.robj == NULL) {
-                r = radeon_bo_create(rdev, NULL, rdev->gart.table_size,
-                                        true, RADEON_GEM_DOMAIN_VRAM,
-                                        &rdev->gart.table.vram.robj);
+                r = radeon_bo_create(rdev, rdev->gart.table_size,
+                                     PAGE_SIZE, true, RADEON_GEM_DOMAIN_VRAM,
+                                     &rdev->gart.table.vram.robj);
                 if (r) {
                         return r;
                 }
@@ -149,8 +149,9 @@ void radeon_gart_unbind(struct radeon_device *rdev, unsigned offset,
         p = t / (PAGE_SIZE / RADEON_GPU_PAGE_SIZE);
         for (i = 0; i < pages; i++, p++) {
                 if (rdev->gart.pages[p]) {
-                        pci_unmap_page(rdev->pdev, rdev->gart.pages_addr[p],
-                                       PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
+                        if (!rdev->gart.ttm_alloced[p])
+                                pci_unmap_page(rdev->pdev, rdev->gart.pages_addr[p],
+                                                PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
                         rdev->gart.pages[p] = NULL;
                         rdev->gart.pages_addr[p] = rdev->dummy_page.addr;
                         page_base = rdev->gart.pages_addr[p];
@@ -165,7 +166,7 @@ void radeon_gart_unbind(struct radeon_device *rdev, unsigned offset,
 }
 
 int radeon_gart_bind(struct radeon_device *rdev, unsigned offset,
-                     int pages, struct page **pagelist)
+                     int pages, struct page **pagelist, dma_addr_t *dma_addr)
 {
         unsigned t;
         unsigned p;
@@ -180,15 +181,22 @@ int radeon_gart_bind(struct radeon_device *rdev, unsigned offset,
         p = t / (PAGE_SIZE / RADEON_GPU_PAGE_SIZE);
 
         for (i = 0; i < pages; i++, p++) {
-                /* we need to support large memory configurations */
-                /* assume that unbind have already been call on the range */
-                rdev->gart.pages_addr[p] = pci_map_page(rdev->pdev, pagelist[i],
+                /* we reverted the patch using dma_addr in TTM for now but this
+                 * code stops building on alpha so just comment it out for now */
+                if (0) { /*dma_addr[i] != DMA_ERROR_CODE) */
+                        rdev->gart.ttm_alloced[p] = true;
+                        rdev->gart.pages_addr[p] = dma_addr[i];
+                } else {
+                        /* we need to support large memory configurations */
+                        /* assume that unbind have already been call on the range */
+                        rdev->gart.pages_addr[p] = pci_map_page(rdev->pdev, pagelist[i],
                                                         0, PAGE_SIZE,
                                                         PCI_DMA_BIDIRECTIONAL);
-                if (pci_dma_mapping_error(rdev->pdev, rdev->gart.pages_addr[p])) {
-                        /* FIXME: failed to map page (return -ENOMEM?) */
-                        radeon_gart_unbind(rdev, offset, pages);
-                        return -ENOMEM;
+                        if (pci_dma_mapping_error(rdev->pdev, rdev->gart.pages_addr[p])) {
+                                /* FIXME: failed to map page (return -ENOMEM?) */
+                                radeon_gart_unbind(rdev, offset, pages);
+                                return -ENOMEM;
+                        }
                 }
                 rdev->gart.pages[p] = pagelist[i];
                 page_base = rdev->gart.pages_addr[p];
@@ -251,6 +259,12 @@ int radeon_gart_init(struct radeon_device *rdev)
                 radeon_gart_fini(rdev);
                 return -ENOMEM;
         }
+        rdev->gart.ttm_alloced = kzalloc(sizeof(bool) *
+                                         rdev->gart.num_cpu_pages, GFP_KERNEL);
+        if (rdev->gart.ttm_alloced == NULL) {
+                radeon_gart_fini(rdev);
+                return -ENOMEM;
+        }
         /* set GART entry to point to the dummy page by default */
         for (i = 0; i < rdev->gart.num_cpu_pages; i++) {
                 rdev->gart.pages_addr[i] = rdev->dummy_page.addr;
@@ -267,6 +281,10 @@ void radeon_gart_fini(struct radeon_device *rdev)
         rdev->gart.ready = false;
         kfree(rdev->gart.pages);
         kfree(rdev->gart.pages_addr);
+        kfree(rdev->gart.ttm_alloced);
         rdev->gart.pages = NULL;
         rdev->gart.pages_addr = NULL;
+        rdev->gart.ttm_alloced = NULL;
+
+        radeon_dummy_page_fini(rdev);
 }