drm/ttm: isolate dma data from ttm_tt V4

Move dma data to a superset ttm_dma_tt structure which herit
from ttm_tt. This allow driver that don't use dma functionalities
to not have to waste memory for it.

V2 Rebase on top of no memory account changes (where/when is my
   delorean when i need it ?)
V3 Make sure page list is initialized empty
V4 typo/syntax fixes

Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>

3 files changed, 124 insertions, 85 deletions

diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
index 8d6267e434ab..499debda791e 100644
--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
+++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
@@ -662,13 +662,61 @@ out:
         return count;
 }
 
+/* Put all pages in pages list to correct pool to wait for reuse */
+static void ttm_put_pages(struct page **pages, unsigned npages, int flags,
+                          enum ttm_caching_state cstate)
+{
+        unsigned long irq_flags;
+        struct ttm_page_pool *pool = ttm_get_pool(flags, cstate);
+        unsigned i;
+
+        if (pool == NULL) {
+                /* No pool for this memory type so free the pages */
+                for (i = 0; i < npages; i++) {
+                        if (pages[i]) {
+                                if (page_count(pages[i]) != 1)
+                                        printk(KERN_ERR TTM_PFX
+                                               "Erroneous page count. "
+                                               "Leaking pages.\n");
+                                __free_page(pages[i]);
+                                pages[i] = NULL;
+                        }
+                }
+                return;
+        }
+
+        spin_lock_irqsave(&pool->lock, irq_flags);
+        for (i = 0; i < npages; i++) {
+                if (pages[i]) {
+                        if (page_count(pages[i]) != 1)
+                                printk(KERN_ERR TTM_PFX
+                                       "Erroneous page count. "
+                                       "Leaking pages.\n");
+                        list_add_tail(&pages[i]->lru, &pool->list);
+                        pages[i] = NULL;
+                        pool->npages++;
+                }
+        }
+        /* Check that we don't go over the pool limit */
+        npages = 0;
+        if (pool->npages > _manager->options.max_size) {
+                npages = pool->npages - _manager->options.max_size;
+                /* free at least NUM_PAGES_TO_ALLOC number of pages
+                 * to reduce calls to set_memory_wb */
+                if (npages < NUM_PAGES_TO_ALLOC)
+                        npages = NUM_PAGES_TO_ALLOC;
+        }
+        spin_unlock_irqrestore(&pool->lock, irq_flags);
+        if (npages)
+                ttm_page_pool_free(pool, npages);
+}
+
 /*
  * On success pages list will hold count number of correctly
  * cached pages.
  */
-int ttm_get_pages(struct page **pages, int flags,
-                  enum ttm_caching_state cstate, unsigned npages,
-                  dma_addr_t *dma_address)
+static int ttm_get_pages(struct page **pages, unsigned npages, int flags,
+                         enum ttm_caching_state cstate)
 {
         struct ttm_page_pool *pool = ttm_get_pool(flags, cstate);
         struct list_head plist;
@@ -736,7 +784,7 @@ int ttm_get_pages(struct page **pages, int flags,
                         printk(KERN_ERR TTM_PFX
                                "Failed to allocate extra pages "
                                "for large request.");
-                        ttm_put_pages(pages, count, flags, cstate, NULL);
+                        ttm_put_pages(pages, count, flags, cstate);
                         return r;
                 }
         }
@@ -744,55 +792,6 @@ int ttm_get_pages(struct page **pages, int flags,
         return 0;
 }
 
-/* Put all pages in pages list to correct pool to wait for reuse */
-void ttm_put_pages(struct page **pages, unsigned npages, int flags,
-                   enum ttm_caching_state cstate, dma_addr_t *dma_address)
-{
-        unsigned long irq_flags;
-        struct ttm_page_pool *pool = ttm_get_pool(flags, cstate);
-        unsigned i;
-
-        if (pool == NULL) {
-                /* No pool for this memory type so free the pages */
-                for (i = 0; i < npages; i++) {
-                        if (pages[i]) {
-                                if (page_count(pages[i]) != 1)
-                                        printk(KERN_ERR TTM_PFX
-                                               "Erroneous page count. "
-                                               "Leaking pages.\n");
-                                __free_page(pages[i]);
-                                pages[i] = NULL;
-                        }
-                }
-                return;
-        }
-
-        spin_lock_irqsave(&pool->lock, irq_flags);
-        for (i = 0; i < npages; i++) {
-                if (pages[i]) {
-                        if (page_count(pages[i]) != 1)
-                                printk(KERN_ERR TTM_PFX
-                                       "Erroneous page count. "
-                                       "Leaking pages.\n");
-                        list_add_tail(&pages[i]->lru, &pool->list);
-                        pages[i] = NULL;
-                        pool->npages++;
-                }
-        }
-        /* Check that we don't go over the pool limit */
-        npages = 0;
-        if (pool->npages > _manager->options.max_size) {
-                npages = pool->npages - _manager->options.max_size;
-                /* free at least NUM_PAGES_TO_ALLOC number of pages
-                 * to reduce calls to set_memory_wb */
-                if (npages < NUM_PAGES_TO_ALLOC)
-                        npages = NUM_PAGES_TO_ALLOC;
-        }
-        spin_unlock_irqrestore(&pool->lock, irq_flags);
-        if (npages)
-                ttm_page_pool_free(pool, npages);
-}
-
 static void ttm_page_pool_init_locked(struct ttm_page_pool *pool, int flags,
                 char *name)
 {
@@ -865,9 +864,9 @@ int ttm_pool_populate(struct ttm_tt *ttm)
                 return 0;
 
         for (i = 0; i < ttm->num_pages; ++i) {
-                ret = ttm_get_pages(&ttm->pages[i], ttm->page_flags,
-                                    ttm->caching_state, 1,
-                                    &ttm->dma_address[i]);
+                ret = ttm_get_pages(&ttm->pages[i], 1,
+                                    ttm->page_flags,
+                                    ttm->caching_state);
                 if (ret != 0) {
                         ttm_pool_unpopulate(ttm);
                         return -ENOMEM;
@@ -904,8 +903,7 @@ void ttm_pool_unpopulate(struct ttm_tt *ttm)
                                                  ttm->pages[i]);
                         ttm_put_pages(&ttm->pages[i], 1,
                                       ttm->page_flags,
-                                      ttm->caching_state,
-                                      ttm->dma_address);
+                                      ttm->caching_state);
                 }
         }
         ttm->state = tt_unpopulated;
diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
index 7a4779304877..6678abca0d98 100644
--- a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
+++ b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
@@ -789,7 +789,7 @@ out:
 
 /*
  * @return count of pages still required to fulfill the request.
-*/
+ */
 static int ttm_dma_page_pool_fill_locked(struct dma_pool *pool,
                                          unsigned long *irq_flags)
 {
@@ -838,10 +838,11 @@ static int ttm_dma_page_pool_fill_locked(struct dma_pool *pool,
  * allocates one page at a time.
  */
 static int ttm_dma_pool_get_pages(struct dma_pool *pool,
-                                  struct ttm_tt *ttm,
+                                  struct ttm_dma_tt *ttm_dma,
                                   unsigned index)
 {
         struct dma_page *d_page;
+        struct ttm_tt *ttm = &ttm_dma->ttm;
         unsigned long irq_flags;
         int count, r = -ENOMEM;
 
@@ -850,8 +851,8 @@ static int ttm_dma_pool_get_pages(struct dma_pool *pool,
         if (count) {
                 d_page = list_first_entry(&pool->free_list, struct dma_page, page_list);
                 ttm->pages[index] = d_page->p;
-                ttm->dma_address[index] = d_page->dma;
-                list_move_tail(&d_page->page_list, &ttm->alloc_list);
+                ttm_dma->dma_address[index] = d_page->dma;
+                list_move_tail(&d_page->page_list, &ttm_dma->pages_list);
                 r = 0;
                 pool->npages_in_use += 1;
                 pool->npages_free -= 1;
@@ -864,8 +865,9 @@ static int ttm_dma_pool_get_pages(struct dma_pool *pool,
  * On success pages list will hold count number of correctly
  * cached pages. On failure will hold the negative return value (-ENOMEM, etc).
  */
-int ttm_dma_populate(struct ttm_tt *ttm, struct device *dev)
+int ttm_dma_populate(struct ttm_dma_tt *ttm_dma, struct device *dev)
 {
+        struct ttm_tt *ttm = &ttm_dma->ttm;
         struct ttm_mem_global *mem_glob = ttm->glob->mem_glob;
         struct dma_pool *pool;
         enum pool_type type;
@@ -892,18 +894,18 @@ int ttm_dma_populate(struct ttm_tt *ttm, struct device *dev)
                 }
         }
 
-        INIT_LIST_HEAD(&ttm->alloc_list);
+        INIT_LIST_HEAD(&ttm_dma->pages_list);
         for (i = 0; i < ttm->num_pages; ++i) {
-                ret = ttm_dma_pool_get_pages(pool, ttm, i);
+                ret = ttm_dma_pool_get_pages(pool, ttm_dma, i);
                 if (ret != 0) {
-                        ttm_dma_unpopulate(ttm, dev);
+                        ttm_dma_unpopulate(ttm_dma, dev);
                         return -ENOMEM;
                 }
 
                 ret = ttm_mem_global_alloc_page(mem_glob, ttm->pages[i],
                                                 false, false);
                 if (unlikely(ret != 0)) {
-                        ttm_dma_unpopulate(ttm, dev);
+                        ttm_dma_unpopulate(ttm_dma, dev);
                         return -ENOMEM;
                 }
         }
@@ -911,7 +913,7 @@ int ttm_dma_populate(struct ttm_tt *ttm, struct device *dev)
         if (unlikely(ttm->page_flags & TTM_PAGE_FLAG_SWAPPED)) {
                 ret = ttm_tt_swapin(ttm);
                 if (unlikely(ret != 0)) {
-                        ttm_dma_unpopulate(ttm, dev);
+                        ttm_dma_unpopulate(ttm_dma, dev);
                         return ret;
                 }
         }
@@ -937,8 +939,9 @@ static int ttm_dma_pool_get_num_unused_pages(void)
 }
 
 /* Put all pages in pages list to correct pool to wait for reuse */
-void ttm_dma_unpopulate(struct ttm_tt *ttm, struct device *dev)
+void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev)
 {
+        struct ttm_tt *ttm = &ttm_dma->ttm;
         struct dma_pool *pool;
         struct dma_page *d_page, *next;
         enum pool_type type;
@@ -956,7 +959,7 @@ void ttm_dma_unpopulate(struct ttm_tt *ttm, struct device *dev)
                      ttm_to_type(ttm->page_flags, tt_cached)) == pool);
 
         /* make sure pages array match list and count number of pages */
-        list_for_each_entry(d_page, &ttm->alloc_list, page_list) {
+        list_for_each_entry(d_page, &ttm_dma->pages_list, page_list) {
                 ttm->pages[count] = d_page->p;
                 count++;
         }
@@ -967,7 +970,7 @@ void ttm_dma_unpopulate(struct ttm_tt *ttm, struct device *dev)
                 pool->nfrees += count;
         } else {
                 pool->npages_free += count;
-                list_splice(&ttm->alloc_list, &pool->free_list);
+                list_splice(&ttm_dma->pages_list, &pool->free_list);
                 if (pool->npages_free > _manager->options.max_size) {
                         count = pool->npages_free - _manager->options.max_size;
                 }
@@ -975,7 +978,7 @@ void ttm_dma_unpopulate(struct ttm_tt *ttm, struct device *dev)
         spin_unlock_irqrestore(&pool->lock, irq_flags);
 
         if (is_cached) {
-                list_for_each_entry_safe(d_page, next, &ttm->alloc_list, page_list) {
+                list_for_each_entry_safe(d_page, next, &ttm_dma->pages_list, page_list) {
                         ttm_mem_global_free_page(ttm->glob->mem_glob,
                                                  d_page->p);
                         ttm_dma_page_put(pool, d_page);
@@ -987,10 +990,10 @@ void ttm_dma_unpopulate(struct ttm_tt *ttm, struct device *dev)
                 }
         }
 
-        INIT_LIST_HEAD(&ttm->alloc_list);
+        INIT_LIST_HEAD(&ttm_dma->pages_list);
         for (i = 0; i < ttm->num_pages; i++) {
                 ttm->pages[i] = NULL;
-                ttm->dma_address[i] = 0;
+                ttm_dma->dma_address[i] = 0;
         }
 
         /* shrink pool if necessary */
diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c
index 1625739b434b..58e1fa14fe3a 100644
--- a/drivers/gpu/drm/ttm/ttm_tt.c
+++ b/drivers/gpu/drm/ttm/ttm_tt.c
@@ -48,17 +48,14 @@
  */
 static void ttm_tt_alloc_page_directory(struct ttm_tt *ttm)
 {
-        ttm->pages = drm_calloc_large(ttm->num_pages, sizeof(*ttm->pages));
-        ttm->dma_address = drm_calloc_large(ttm->num_pages,
-                                            sizeof(*ttm->dma_address));
+        ttm->pages = drm_calloc_large(ttm->num_pages, sizeof(void*));
 }
 
-static void ttm_tt_free_page_directory(struct ttm_tt *ttm)
+static void ttm_dma_tt_alloc_page_directory(struct ttm_dma_tt *ttm)
 {
-        drm_free_large(ttm->pages);
-        ttm->pages = NULL;
-        drm_free_large(ttm->dma_address);
-        ttm->dma_address = NULL;
+        ttm->ttm.pages = drm_calloc_large(ttm->ttm.num_pages, sizeof(void*));
+        ttm->dma_address = drm_calloc_large(ttm->ttm.num_pages,
+                                            sizeof(*ttm->dma_address));
 }
 
 #ifdef CONFIG_X86
@@ -173,7 +170,6 @@ void ttm_tt_destroy(struct ttm_tt *ttm)
 
         if (likely(ttm->pages != NULL)) {
                 ttm->bdev->driver->ttm_tt_unpopulate(ttm);
-                ttm_tt_free_page_directory(ttm);
         }
 
         if (!(ttm->page_flags & TTM_PAGE_FLAG_PERSISTENT_SWAP) &&
@@ -196,9 +192,8 @@ int ttm_tt_init(struct ttm_tt *ttm, struct ttm_bo_device *bdev,
         ttm->dummy_read_page = dummy_read_page;
         ttm->state = tt_unpopulated;
 
-        INIT_LIST_HEAD(&ttm->alloc_list);
         ttm_tt_alloc_page_directory(ttm);
-        if (!ttm->pages || !ttm->dma_address) {
+        if (!ttm->pages) {
                 ttm_tt_destroy(ttm);
                 printk(KERN_ERR TTM_PFX "Failed allocating page table\n");
                 return -ENOMEM;
@@ -207,6 +202,49 @@ int ttm_tt_init(struct ttm_tt *ttm, struct ttm_bo_device *bdev,
 }
 EXPORT_SYMBOL(ttm_tt_init);
 
+void ttm_tt_fini(struct ttm_tt *ttm)
+{
+        drm_free_large(ttm->pages);
+        ttm->pages = NULL;
+}
+EXPORT_SYMBOL(ttm_tt_fini);
+
+int ttm_dma_tt_init(struct ttm_dma_tt *ttm_dma, struct ttm_bo_device *bdev,
+                unsigned long size, uint32_t page_flags,
+                struct page *dummy_read_page)
+{
+        struct ttm_tt *ttm = &ttm_dma->ttm;
+
+        ttm->bdev = bdev;
+        ttm->glob = bdev->glob;
+        ttm->num_pages = (size + PAGE_SIZE - 1) >> PAGE_SHIFT;
+        ttm->caching_state = tt_cached;
+        ttm->page_flags = page_flags;
+        ttm->dummy_read_page = dummy_read_page;
+        ttm->state = tt_unpopulated;
+
+        INIT_LIST_HEAD(&ttm_dma->pages_list);
+        ttm_dma_tt_alloc_page_directory(ttm_dma);
+        if (!ttm->pages || !ttm_dma->dma_address) {
+                ttm_tt_destroy(ttm);
+                printk(KERN_ERR TTM_PFX "Failed allocating page table\n");
+                return -ENOMEM;
+        }
+        return 0;
+}
+EXPORT_SYMBOL(ttm_dma_tt_init);
+
+void ttm_dma_tt_fini(struct ttm_dma_tt *ttm_dma)
+{
+        struct ttm_tt *ttm = &ttm_dma->ttm;
+
+        drm_free_large(ttm->pages);
+        ttm->pages = NULL;
+        drm_free_large(ttm_dma->dma_address);
+        ttm_dma->dma_address = NULL;
+}
+EXPORT_SYMBOL(ttm_dma_tt_fini);
+
 void ttm_tt_unbind(struct ttm_tt *ttm)
 {
         int ret;