drm/ttm: introduce callback for ttm_tt populate & unpopulate V4

Move the page allocation and freeing to driver callback and
provide ttm code helper function for those.

Most intrusive change, is the fact that we now only fully
populate an object this simplify some of code designed around
the page fault design.

V2 Rebase on top of memory accounting overhaul
V3 New rebase on top of more memory accouting changes
V4 Rebase on top of no memory account changes (where/when is my
   delorean when i need it ?)

Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>

1 files changed, 17 insertions, 14 deletions

diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c
index 082fcaea583f..60f204d67dbb 100644
--- a/drivers/gpu/drm/ttm/ttm_bo_util.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_util.c
@@ -244,7 +244,7 @@ static int ttm_copy_io_ttm_page(struct ttm_tt *ttm, void *src,
                                 unsigned long page,
                                 pgprot_t prot)
 {
-        struct page *d = ttm_tt_get_page(ttm, page);
+        struct page *d = ttm->pages[page];
         void *dst;
 
         if (!d)
@@ -281,7 +281,7 @@ static int ttm_copy_ttm_io_page(struct ttm_tt *ttm, void *dst,
                                 unsigned long page,
                                 pgprot_t prot)
 {
-        struct page *s = ttm_tt_get_page(ttm, page);
+        struct page *s = ttm->pages[page];
         void *src;
 
         if (!s)
@@ -342,6 +342,12 @@ int ttm_bo_move_memcpy(struct ttm_buffer_object *bo,
         if (old_iomap == NULL && ttm == NULL)
                 goto out2;
 
+        if (ttm->state == tt_unpopulated) {
+                ret = ttm->bdev->driver->ttm_tt_populate(ttm);
+                if (ret)
+                        goto out1;
+        }
+
         add = 0;
         dir = 1;
 
@@ -502,10 +508,16 @@ static int ttm_bo_kmap_ttm(struct ttm_buffer_object *bo,
 {
         struct ttm_mem_reg *mem = &bo->mem; pgprot_t prot;
         struct ttm_tt *ttm = bo->ttm;
-        struct page *d;
-        int i;
+        int ret;
 
         BUG_ON(!ttm);
+
+        if (ttm->state == tt_unpopulated) {
+                ret = ttm->bdev->driver->ttm_tt_populate(ttm);
+                if (ret)
+                        return ret;
+        }
+
         if (num_pages == 1 && (mem->placement & TTM_PL_FLAG_CACHED)) {
                 /*
                  * We're mapping a single page, and the desired
@@ -513,18 +525,9 @@ static int ttm_bo_kmap_ttm(struct ttm_buffer_object *bo,
                  */
 
                 map->bo_kmap_type = ttm_bo_map_kmap;
-                map->page = ttm_tt_get_page(ttm, start_page);
+                map->page = ttm->pages[start_page];
                 map->virtual = kmap(map->page);
         } else {
-            /*
-             * Populate the part we're mapping;
-             */
-                for (i = start_page; i < start_page + num_pages; ++i) {
-                        d = ttm_tt_get_page(ttm, i);
-                        if (!d)
-                                return -ENOMEM;
-                }
-
                 /*
                  * We need to use vmap to get the desired page protection
                  * or to make the buffer object look contiguous.