drm/ttm: Memory accounting rework.

Use inclusive zones to simplify accounting and its sysfs representation.
Use DMA32 accounting where applicable.

Add a sysfs interface to make the heuristically determined limits
readable and configurable.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Dave Airlie <airlied@linux.ie>

1 files changed, 11 insertions, 18 deletions

diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c
index 75dc8bd24592..4e1e2566d519 100644
--- a/drivers/gpu/drm/ttm/ttm_tt.c
+++ b/drivers/gpu/drm/ttm/ttm_tt.c
@@ -166,7 +166,7 @@ static void ttm_tt_free_user_pages(struct ttm_tt *ttm)
                         set_page_dirty_lock(page);
 
                 ttm->pages[i] = NULL;
-                ttm_mem_global_free(ttm->bdev->mem_glob, PAGE_SIZE, false);
+                ttm_mem_global_free(ttm->bdev->mem_glob, PAGE_SIZE);
                 put_page(page);
         }
         ttm->state = tt_unpopulated;
@@ -187,21 +187,14 @@ static struct page *__ttm_tt_get_page(struct ttm_tt *ttm, int index)
                 if (!p)
                         return NULL;
 
-                if (PageHighMem(p)) {
-                        ret =
-                            ttm_mem_global_alloc(mem_glob, PAGE_SIZE,
-                                                 false, false, true);
-                        if (unlikely(ret != 0))
-                                goto out_err;
+                ret = ttm_mem_global_alloc_page(mem_glob, p, false, false);
+                if (unlikely(ret != 0))
+                        goto out_err;
+
+                if (PageHighMem(p))
                         ttm->pages[--ttm->first_himem_page] = p;
-                } else {
-                        ret =
-                            ttm_mem_global_alloc(mem_glob, PAGE_SIZE,
-                                                 false, false, false);
-                        if (unlikely(ret != 0))
-                                goto out_err;
+                else
                         ttm->pages[++ttm->last_lomem_page] = p;
-                }
         }
         return p;
 out_err:
@@ -355,8 +348,8 @@ static void ttm_tt_free_alloced_pages(struct ttm_tt *ttm)
                                 printk(KERN_ERR TTM_PFX
                                        "Erroneous page count. "
                                        "Leaking pages.\n");
-                        ttm_mem_global_free(ttm->bdev->mem_glob, PAGE_SIZE,
-                                            PageHighMem(cur_page));
+                        ttm_mem_global_free_page(ttm->bdev->mem_glob,
+                                                 cur_page);
                         __free_page(cur_page);
                 }
         }
@@ -411,7 +404,7 @@ int ttm_tt_set_user(struct ttm_tt *ttm,
          */
 
         ret = ttm_mem_global_alloc(mem_glob, num_pages * PAGE_SIZE,
-                                   false, false, false);
+                                   false, false);
         if (unlikely(ret != 0))
                 return ret;
 
@@ -422,7 +415,7 @@ int ttm_tt_set_user(struct ttm_tt *ttm,
 
         if (ret != num_pages && write) {
                 ttm_tt_free_user_pages(ttm);
-                ttm_mem_global_free(mem_glob, num_pages * PAGE_SIZE, false);
+                ttm_mem_global_free(mem_glob, num_pages * PAGE_SIZE);
                 return -ENOMEM;
         }