diff options
-rw-r--r-- | drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/ttm/ttm_tt.c | 7 | ||||
-rw-r--r-- | include/drm/ttm/ttm_bo_driver.h | 2 |
3 files changed, 2 insertions, 9 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c index bef9f6feb635..cec4b4baa179 100644 --- a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c +++ b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | |||
@@ -858,7 +858,6 @@ static int ttm_dma_pool_get_pages(struct dma_pool *pool, | |||
858 | if (count) { | 858 | if (count) { |
859 | d_page = list_first_entry(&pool->free_list, struct dma_page, page_list); | 859 | d_page = list_first_entry(&pool->free_list, struct dma_page, page_list); |
860 | ttm->pages[index] = d_page->p; | 860 | ttm->pages[index] = d_page->p; |
861 | ttm_dma->cpu_address[index] = d_page->vaddr; | ||
862 | ttm_dma->dma_address[index] = d_page->dma; | 861 | ttm_dma->dma_address[index] = d_page->dma; |
863 | list_move_tail(&d_page->page_list, &ttm_dma->pages_list); | 862 | list_move_tail(&d_page->page_list, &ttm_dma->pages_list); |
864 | r = 0; | 863 | r = 0; |
@@ -989,7 +988,6 @@ void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev) | |||
989 | INIT_LIST_HEAD(&ttm_dma->pages_list); | 988 | INIT_LIST_HEAD(&ttm_dma->pages_list); |
990 | for (i = 0; i < ttm->num_pages; i++) { | 989 | for (i = 0; i < ttm->num_pages; i++) { |
991 | ttm->pages[i] = NULL; | 990 | ttm->pages[i] = NULL; |
992 | ttm_dma->cpu_address[i] = 0; | ||
993 | ttm_dma->dma_address[i] = 0; | 991 | ttm_dma->dma_address[i] = 0; |
994 | } | 992 | } |
995 | 993 | ||
diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c index bc5aa573f466..aee3c00f836e 100644 --- a/drivers/gpu/drm/ttm/ttm_tt.c +++ b/drivers/gpu/drm/ttm/ttm_tt.c | |||
@@ -57,10 +57,8 @@ static void ttm_dma_tt_alloc_page_directory(struct ttm_dma_tt *ttm) | |||
57 | { | 57 | { |
58 | ttm->ttm.pages = drm_calloc_large(ttm->ttm.num_pages, | 58 | ttm->ttm.pages = drm_calloc_large(ttm->ttm.num_pages, |
59 | sizeof(*ttm->ttm.pages) + | 59 | sizeof(*ttm->ttm.pages) + |
60 | sizeof(*ttm->dma_address) + | 60 | sizeof(*ttm->dma_address)); |
61 | sizeof(*ttm->cpu_address)); | 61 | ttm->dma_address = (void *) (ttm->ttm.pages + ttm->ttm.num_pages); |
62 | ttm->cpu_address = (void *) (ttm->ttm.pages + ttm->ttm.num_pages); | ||
63 | ttm->dma_address = (void *) (ttm->cpu_address + ttm->ttm.num_pages); | ||
64 | } | 62 | } |
65 | 63 | ||
66 | #ifdef CONFIG_X86 | 64 | #ifdef CONFIG_X86 |
@@ -244,7 +242,6 @@ void ttm_dma_tt_fini(struct ttm_dma_tt *ttm_dma) | |||
244 | 242 | ||
245 | drm_free_large(ttm->pages); | 243 | drm_free_large(ttm->pages); |
246 | ttm->pages = NULL; | 244 | ttm->pages = NULL; |
247 | ttm_dma->cpu_address = NULL; | ||
248 | ttm_dma->dma_address = NULL; | 245 | ttm_dma->dma_address = NULL; |
249 | } | 246 | } |
250 | EXPORT_SYMBOL(ttm_dma_tt_fini); | 247 | EXPORT_SYMBOL(ttm_dma_tt_fini); |
diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h index c986fa7effd2..4f0a92185995 100644 --- a/include/drm/ttm/ttm_bo_driver.h +++ b/include/drm/ttm/ttm_bo_driver.h | |||
@@ -133,7 +133,6 @@ struct ttm_tt { | |||
133 | * struct ttm_dma_tt | 133 | * struct ttm_dma_tt |
134 | * | 134 | * |
135 | * @ttm: Base ttm_tt struct. | 135 | * @ttm: Base ttm_tt struct. |
136 | * @cpu_address: The CPU address of the pages | ||
137 | * @dma_address: The DMA (bus) addresses of the pages | 136 | * @dma_address: The DMA (bus) addresses of the pages |
138 | * @pages_list: used by some page allocation backend | 137 | * @pages_list: used by some page allocation backend |
139 | * | 138 | * |
@@ -143,7 +142,6 @@ struct ttm_tt { | |||
143 | */ | 142 | */ |
144 | struct ttm_dma_tt { | 143 | struct ttm_dma_tt { |
145 | struct ttm_tt ttm; | 144 | struct ttm_tt ttm; |
146 | void **cpu_address; | ||
147 | dma_addr_t *dma_address; | 145 | dma_addr_t *dma_address; |
148 | struct list_head pages_list; | 146 | struct list_head pages_list; |
149 | }; | 147 | }; |