drm/amd/amdgpu: Use new TTM populate/map helper function
Subsystems (2)
PATCH 1/2 drm/amd/amdgpu: Use new TTM populate/map helper function
Signed-off-by Tom St Denis <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 33 ++------------------------------- 1 file changed, 2 insertions(+), 31 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +2 -31
@@ -916,7 +916,6 @@ static int amdgpu_ttm_tt_populate(struct ttm_tt *ttm) {struct amdgpu_device *adev =amdgpu_ttm_adev (ttm->bdev);struct amdgpu_ttm_tt *gtt = (void *)ttm; -unsigned i;int r;bool slave = !!(ttm->page_flags &TTM_PAGE_FLAG_SG );
@@ -948,27 +947,7 @@ static int amdgpu_ttm_tt_populate(struct ttm_tt *ttm) }#endif - r =ttm_pool_populate (ttm); -if (r) { -return r; - } - -for (i =0 ; i < ttm->num_pages; i++) { - gtt->ttm.dma_address[i] =pci_map_page (adev->pdev, ttm->pages[i], -0 ,PAGE_SIZE , -PCI_DMA_BIDIRECTIONAL ); -if (pci_dma_mapping_error (adev->pdev, gtt->ttm.dma_address[i])) { -while (i--) { -pci_unmap_page (adev->pdev, gtt->ttm.dma_address[i], -PAGE_SIZE ,PCI_DMA_BIDIRECTIONAL ); - gtt->ttm.dma_address[i] =0 ; - } -ttm_pool_unpopulate (ttm); -return -EFAULT ; - } - } - - r =0 ; + r =ttm_populate_and_map_pages (adev->dev, >t->ttm); trace_mappings:if (likely (!r))amdgpu_trace_dma_map (ttm);
@@ -979,7 +958,6 @@ static void amdgpu_ttm_tt_unpopulate(struct ttm_tt *ttm) {struct amdgpu_device *adev;struct amdgpu_ttm_tt *gtt = (void *)ttm; -unsigned i;bool slave = !!(ttm->page_flags &TTM_PAGE_FLAG_SG );if (gtt && gtt->userptr) {
@@ -1002,14 +980,7 @@ static void amdgpu_ttm_tt_unpopulate(struct ttm_tt *ttm) }#endif -for (i =0 ; i < ttm->num_pages; i++) { -if (gtt->ttm.dma_address[i]) { -pci_unmap_page (adev->pdev, gtt->ttm.dma_address[i], -PAGE_SIZE ,PCI_DMA_BIDIRECTIONAL ); - } - } - -ttm_pool_unpopulate (ttm); +ttm_unmap_and_unpopulate_pages (adev->dev, >t->ttm); } int amdgpu_ttm_tt_set_userptr(struct ttm_tt *ttm, uint64_t addr,
Signature · 6 lines
2.12.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 2/2 drm/radeon: use new TTM populate/dma map helper functions
Signed-off-by Tom St Denis <[email protected]>
--- drivers/gpu/drm/radeon/radeon_ttm.c | 33 ++------------------------------- 1 file changed, 2 insertions(+), 31 deletions(-)
drivers/gpu/drm/radeon/radeon_ttm.c +2 -31
@@ -725,8 +725,6 @@ static int radeon_ttm_tt_populate(struct ttm_tt *ttm) {struct radeon_ttm_tt *gtt =radeon_ttm_tt_to_gtt (ttm);struct radeon_device *rdev; -unsigned i; -int r;bool slave = !!(ttm->page_flags &TTM_PAGE_FLAG_SG );if (ttm->state != tt_unpopulated)
@@ -762,33 +760,13 @@ static int radeon_ttm_tt_populate(struct ttm_tt *ttm) }#endif - r =ttm_pool_populate (ttm); -if (r) { -return r; - } - -for (i =0 ; i < ttm->num_pages; i++) { - gtt->ttm.dma_address[i] =pci_map_page (rdev->pdev, ttm->pages[i], -0 ,PAGE_SIZE , -PCI_DMA_BIDIRECTIONAL ); -if (pci_dma_mapping_error (rdev->pdev, gtt->ttm.dma_address[i])) { -while (i--) { -pci_unmap_page (rdev->pdev, gtt->ttm.dma_address[i], -PAGE_SIZE ,PCI_DMA_BIDIRECTIONAL ); - gtt->ttm.dma_address[i] =0 ; - } -ttm_pool_unpopulate (ttm); -return -EFAULT ; - } - } -return 0 ; +return ttm_populate_and_map_pages (rdev->dev, >t->ttm); }static void radeon_ttm_tt_unpopulate (struct ttm_tt *ttm) {struct radeon_device *rdev;struct radeon_ttm_tt *gtt =radeon_ttm_tt_to_gtt (ttm); -unsigned i;bool slave = !!(ttm->page_flags &TTM_PAGE_FLAG_SG );if (gtt && gtt->userptr) {
@@ -815,14 +793,7 @@ static void radeon_ttm_tt_unpopulate(struct ttm_tt *ttm) }#endif -for (i =0 ; i < ttm->num_pages; i++) { -if (gtt->ttm.dma_address[i]) { -pci_unmap_page (rdev->pdev, gtt->ttm.dma_address[i], -PAGE_SIZE ,PCI_DMA_BIDIRECTIONAL ); - } - } - -ttm_pool_unpopulate (ttm); +ttm_unmap_and_unpopulate_pages (rdev->dev, >t->ttm); } int radeon_ttm_tt_set_userptr(struct ttm_tt *ttm, uint64_t addr,
Signature · 6 lines
2.12.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx