GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-07 15:18:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm/ttm: DMA map/unmap consecutive pages as a whole v2

Browse source 
Instead of mapping them bit by bit map/unmap all consecutive
pages as in one call.

v2: test for consecutive pages instead of using compound page order.

Signed-off-by: Christian König <christian.koenig@amd.com>
Acked-by: Felix Kuehling <Felix.Kuehling@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Christian König 2017-09-20 14:07:02 +02:00 • committed by Alex Deucher
parent c6e839a3e2
commit 6056a1a565
1 changed files with 39 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
drivers/gpu/drm/ttm/ttm_page_alloc.c
View file

@ -922,16 +922,26 @@ EXPORT_SYMBOL(ttm_pool_unpopulate);
#if defined(CONFIG_SWIOTLB) || defined(CONFIG_INTEL_IOMMU) #if defined(CONFIG_SWIOTLB) || defined(CONFIG_INTEL_IOMMU)
int ttm_populate_and_map_pages(struct device *dev, struct ttm_dma_tt *tt) int ttm_populate_and_map_pages(struct device *dev, struct ttm_dma_tt *tt)
{ {
unsigned i; unsigned i, j;
int r; int r;
r = ttm_pool_populate(&tt->ttm); r = ttm_pool_populate(&tt->ttm);
if (r) if (r)
return r; return r;
for (i = 0; i < tt->ttm.num_pages; i++) { for (i = 0; i < tt->ttm.num_pages; ++i) {
struct page *p = tt->ttm.pages[i];
size_t num_pages = 1;
for (j = i + 1; j < tt->ttm.num_pages; ++j) {
if (++p != tt->ttm.pages[j])
break;
++num_pages;
}
tt->dma_address[i] = dma_map_page(dev, tt->ttm.pages[i], tt->dma_address[i] = dma_map_page(dev, tt->ttm.pages[i],
0, PAGE_SIZE, 0, num_pages * PAGE_SIZE,
DMA_BIDIRECTIONAL); DMA_BIDIRECTIONAL);
if (dma_mapping_error(dev, tt->dma_address[i])) { if (dma_mapping_error(dev, tt->dma_address[i])) {
while (i--) { while (i--) {
@ -942,6 +952,11 @@ int ttm_populate_and_map_pages(struct device *dev, struct ttm_dma_tt *tt)
ttm_pool_unpopulate(&tt->ttm); ttm_pool_unpopulate(&tt->ttm);
return -EFAULT; return -EFAULT;
} }
for (j = 1; j < num_pages; ++j) {
tt->dma_address[i + 1] = tt->dma_address[i] + PAGE_SIZE;
++i;
}
} }
return 0; return 0;
} }
@ -949,13 +964,28 @@ EXPORT_SYMBOL(ttm_populate_and_map_pages);
void ttm_unmap_and_unpopulate_pages(struct device *dev, struct ttm_dma_tt *tt) void ttm_unmap_and_unpopulate_pages(struct device *dev, struct ttm_dma_tt *tt)
{ {
unsigned i; unsigned i, j;
for (i = 0; i < tt->ttm.num_pages; i++) { for (i = 0; i < tt->ttm.num_pages;) {
if (tt->dma_address[i]) { struct page *p = tt->ttm.pages[i];
dma_unmap_page(dev, tt->dma_address[i], size_t num_pages = 1;
PAGE_SIZE, DMA_BIDIRECTIONAL);
if (!tt->dma_address[i] || !tt->ttm.pages[i]) {
++i;
continue;
} }
for (j = i + 1; j < tt->ttm.num_pages; ++j) {
if (++p != tt->ttm.pages[j])
break;
++num_pages;
}
dma_unmap_page(dev, tt->dma_address[i], num_pages * PAGE_SIZE,
DMA_BIDIRECTIONAL);
i += num_pages;
} }
ttm_pool_unpopulate(&tt->ttm); ttm_pool_unpopulate(&tt->ttm);
} }