Commit c6e839a3 authored by Christian König's avatar Christian König Committed by Alex Deucher

drm/ttm: allocate/free multiple pages in a single call

Totally surprisingly this is more efficient than doing it page by page.
Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Acked-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent a05502e5
...@@ -873,15 +873,14 @@ int ttm_pool_populate(struct ttm_tt *ttm) ...@@ -873,15 +873,14 @@ int ttm_pool_populate(struct ttm_tt *ttm)
if (ttm->state != tt_unpopulated) if (ttm->state != tt_unpopulated)
return 0; return 0;
for (i = 0; i < ttm->num_pages; ++i) { ret = ttm_get_pages(ttm->pages, ttm->num_pages, ttm->page_flags,
ret = ttm_get_pages(&ttm->pages[i], 1, ttm->caching_state);
ttm->page_flags, if (unlikely(ret != 0)) {
ttm->caching_state); ttm_pool_unpopulate(ttm);
if (ret != 0) { return ret;
ttm_pool_unpopulate(ttm); }
return -ENOMEM;
}
for (i = 0; i < ttm->num_pages; ++i) {
ret = ttm_mem_global_alloc_page(mem_glob, ttm->pages[i], ret = ttm_mem_global_alloc_page(mem_glob, ttm->pages[i],
PAGE_SIZE); PAGE_SIZE);
if (unlikely(ret != 0)) { if (unlikely(ret != 0)) {
...@@ -908,14 +907,14 @@ void ttm_pool_unpopulate(struct ttm_tt *ttm) ...@@ -908,14 +907,14 @@ void ttm_pool_unpopulate(struct ttm_tt *ttm)
unsigned i; unsigned i;
for (i = 0; i < ttm->num_pages; ++i) { for (i = 0; i < ttm->num_pages; ++i) {
if (ttm->pages[i]) { if (!ttm->pages[i])
ttm_mem_global_free_page(ttm->glob->mem_glob, continue;
ttm->pages[i], PAGE_SIZE);
ttm_put_pages(&ttm->pages[i], 1, ttm_mem_global_free_page(ttm->glob->mem_glob, ttm->pages[i],
ttm->page_flags, PAGE_SIZE);
ttm->caching_state);
}
} }
ttm_put_pages(ttm->pages, ttm->num_pages, ttm->page_flags,
ttm->caching_state);
ttm->state = tt_unpopulated; ttm->state = tt_unpopulated;
} }
EXPORT_SYMBOL(ttm_pool_unpopulate); EXPORT_SYMBOL(ttm_pool_unpopulate);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment