drm/ttm: remove cpu_address member from ttm_tt

Patch 3d50d4dcb0 exposed the CPU address of DMA-allocated pages as returned by dma_alloc_coherent because Nouveau on Tegra needed it.

This is not required anymore - as there were no other users for it, remove it and save some memory for everyone.

Signed-off-by Alexandre Courbot <[email protected]>

---
  drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 2 --
  drivers/gpu/drm/ttm/ttm_tt.c             | 7 ++-----
  include/drm/ttm/ttm_bo_driver.h          | 2 --
  3 files changed, 2 insertions(+), 9 deletions(-)

drivers/gpu/drm/ttm/ttm_page_alloc_dma.c +0 -2

index bef9f6feb635..cec4b4baa179 100644
@@ -858,7 +858,6 @@ 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->cpu_address[index] = d_page->vaddr;
  		ttm_dma->dma_address[index] = d_page->dma;
  		list_move_tail(&d_page->page_list, &ttm_dma->pages_list);
  		r = 0;

@@ -989,7 +988,6 @@ void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev)
  	INIT_LIST_HEAD(&ttm_dma->pages_list);
  	for (i = 0; i < ttm->num_pages; i++) {
  		ttm->pages[i] = NULL;
-		ttm_dma->cpu_address[i] = 0;
  		ttm_dma->dma_address[i] = 0;
  	}
 

drivers/gpu/drm/ttm/ttm_tt.c +2 -5

index bc5aa573f466..aee3c00f836e 100644
@@ -57,10 +57,8 @@ static void ttm_dma_tt_alloc_page_directory(struct ttm_dma_tt *ttm)
  {
  	ttm->ttm.pages = drm_calloc_large(ttm->ttm.num_pages,
  					  sizeof(*ttm->ttm.pages) +
-					  sizeof(*ttm->dma_address) +
-					  sizeof(*ttm->cpu_address));
-	ttm->cpu_address = (void *) (ttm->ttm.pages + ttm->ttm.num_pages);
-	ttm->dma_address = (void *) (ttm->cpu_address + ttm->ttm.num_pages);
+					  sizeof(*ttm->dma_address));
+	ttm->dma_address = (void *) (ttm->ttm.pages + ttm->ttm.num_pages);
  }
 
  #ifdef CONFIG_X86

@@ -244,7 +242,6 @@ void ttm_dma_tt_fini(struct ttm_dma_tt *ttm_dma)
 
  	drm_free_large(ttm->pages);
  	ttm->pages = NULL;
-	ttm_dma->cpu_address = NULL;
  	ttm_dma->dma_address = NULL;
  }
  EXPORT_SYMBOL(ttm_dma_tt_fini);

include/drm/ttm/ttm_bo_driver.h +0 -2

index c986fa7effd2..4f0a92185995 100644
@@ -133,7 +133,6 @@ struct ttm_tt {
   * struct ttm_dma_tt
   *
   * @ttm: Base ttm_tt struct.
- * @cpu_address: The CPU address of the pages
   * @dma_address: The DMA (bus) addresses of the pages
   * @pages_list: used by some page allocation backend
   *

@@ -143,7 +142,6 @@ struct ttm_tt {
   */
  struct ttm_dma_tt {
  	struct ttm_tt ttm;
-	void **cpu_address;
  	dma_addr_t *dma_address;
  	struct list_head pages_list;
  };

Am 16.09.2016 um 11:32 schrieb Alexandre Courbot:

Quoted 4 lines

Patch 3d50d4dcb0 exposed the CPU address of DMA-allocated pages as returned by dma_alloc_coherent because Nouveau on Tegra needed it.

Quoted 4 lines

This is not required anymore - as there were no other users for it, remove it and save some memory for everyone.

Signed-off-by Alexandre Courbot <[email protected]>

Reviewed-by Christian König <[email protected]>.

Quoted 74 lines

---
  drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 2 --
  drivers/gpu/drm/ttm/ttm_tt.c             | 7 ++-----
  include/drm/ttm/ttm_bo_driver.h          | 2 --
  3 files changed, 2 insertions(+), 9 deletions(-)

drivers/gpu/drm/ttm/ttm_page_alloc_dma.c +0 -1

index bef9f6feb635..cec4b4baa179 100644
@@ -858,7 +858,6 @@ 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->cpu_address[index] = d_page->vaddr;
                ttm_dma->dma_address[index] = d_page->dma;

                list_move_tail(&d_page->page_list, &ttm_dma->pages_list);
                r = 0;

drivers/gpu/drm/ttm/ttm_page_alloc_dma.c +0 -1

@@ -989,7 +988,6 @@ void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma,
 struct device *dev)
        INIT_LIST_HEAD(&ttm_dma->pages_list);
        for (i = 0; i < ttm->num_pages; i++) {
                ttm->pages[i] = NULL;
-               ttm_dma->cpu_address[i] = 0;
                ttm_dma->dma_address[i] = 0;
        }

diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c
index bc5aa573f466..aee3c00f836e 100644

drivers/gpu/drm/ttm/ttm_tt.c +2 -4

@@ -57,10 +57,8 @@ static void ttm_dma_tt_alloc_page_directory(struct
 ttm_dma_tt *ttm)
  {
        ttm->ttm.pages = drm_calloc_large(ttm->ttm.num_pages,
                                          sizeof(*ttm->ttm.pages) +
-                                         sizeof(*ttm->dma_address) +
-                                         sizeof(*ttm->cpu_address));
-       ttm->cpu_address = (void *) (ttm->ttm.pages + ttm->ttm.num_pages);
-       ttm->dma_address = (void *) (ttm->cpu_address +
 ttm->ttm.num_pages);
+                                         sizeof(*ttm->dma_address));
+       ttm->dma_address = (void *) (ttm->ttm.pages + ttm->ttm.num_pages);
  }

    #ifdef CONFIG_X86

drivers/gpu/drm/ttm/ttm_tt.c +0 -1

@@ -244,7 +242,6 @@ void ttm_dma_tt_fini(struct ttm_dma_tt *ttm_dma)
        drm_free_large(ttm->pages);
        ttm->pages = NULL;
-       ttm_dma->cpu_address = NULL;
        ttm_dma->dma_address = NULL;
  }
  EXPORT_SYMBOL(ttm_dma_tt_fini);

include/drm/ttm/ttm_bo_driver.h +0 -2

index c986fa7effd2..4f0a92185995 100644
@@ -133,7 +133,6 @@ struct ttm_tt {
   * struct ttm_dma_tt
   *
   * @ttm: Base ttm_tt struct.
- * @cpu_address: The CPU address of the pages
   * @dma_address: The DMA (bus) addresses of the pages
   * @pages_list: used by some page allocation backend
   *

@@ -143,7 +142,6 @@ struct ttm_tt {
   */
  struct ttm_dma_tt {
        struct ttm_tt ttm;
-       void **cpu_address;
        dma_addr_t *dma_address;
        struct list_head pages_list;

include/drm/ttm/ttm_bo_driver.h struct ttm_tt { · line 147

Quoted 1 line

include/drm/ttm/ttm_bo_driver.h +0 -0

  };

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel