nouveau: use ttm populate mapping functions.
Subsystems (3)
Dave Airlie
maintainerPATCH 1/1 nouveau: use ttm populate mapping functions.
From: Dave Airlie <[email protected]>
Instead of rolling driver copies of them.
Signed-off-by Dave Airlie <[email protected]>
--- drivers/gpu/drm/nouveau/nouveau_bo.c | 32 ++-------------------------- 1 file changed, 2 insertions(+), 30 deletions(-)
drivers/gpu/drm/nouveau/nouveau_bo.c +2 -30
@@ -1231,7 +1231,6 @@ nouveau_ttm_tt_populate(struct ttm_tt *ttm, struct ttm_operation_ctx *ctx)struct ttm_dma_tt *ttm_dma = (void *)ttm;struct nouveau_drm *drm;struct device *dev; -unsigned i;int r;bool slave = !!(ttm->page_flags &TTM_PAGE_FLAG_SG );
@@ -1261,29 +1260,10 @@ nouveau_ttm_tt_populate(struct ttm_tt *ttm, struct ttm_operation_ctx *ctx) }#endif - r =ttm_pool_populate (ttm, ctx); + r =ttm_populate_and_map_pages (dev, ttm_dma, ctx);if (r) {return r; } - -for (i =0 ; i < ttm->num_pages; i++) { -dma_addr_t addr; - - addr =dma_map_page (dev, ttm->pages[i],0 ,PAGE_SIZE , -DMA_BIDIRECTIONAL ); - -if (dma_mapping_error (dev, addr)) { -while (i--) { -dma_unmap_page (dev, ttm_dma->dma_address[i], -PAGE_SIZE ,DMA_BIDIRECTIONAL ); - ttm_dma->dma_address[i] =0 ; - } -ttm_pool_unpopulate (ttm); -return -EFAULT ; - } - - ttm_dma->dma_address[i] = addr; - }return 0 ; }
@@ -1293,7 +1273,6 @@ nouveau_ttm_tt_unpopulate(struct ttm_tt *ttm)struct ttm_dma_tt *ttm_dma = (void *)ttm;struct nouveau_drm *drm;struct device *dev; -unsigned i;bool slave = !!(ttm->page_flags &TTM_PAGE_FLAG_SG );if (slave)
@@ -1316,14 +1295,7 @@ nouveau_ttm_tt_unpopulate(struct ttm_tt *ttm) }#endif -for (i =0 ; i < ttm->num_pages; i++) { -if (ttm_dma->dma_address[i]) { -dma_unmap_page (dev, ttm_dma->dma_address[i],PAGE_SIZE , -DMA_BIDIRECTIONAL ); - } - } - -ttm_pool_unpopulate (ttm); +ttm_unmap_and_unpopulate_pages (dev, ttm_dma); }void
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel