drm/ttm: move non-x86 definitions to the common header
Subsystems (3)
cover drm/ttm: move non-x86 definitions to the common header
Hi,
As suggested by Christian, we should move non-x86 definitions into one common header, and it will make the codes readable. They are based on the improvement fix of Bas (already rebase Bas's patch to drm-next).
Thanks,
Ray
Bas Nieuwenhuizen (1):
drm/ttm: Merge hugepage attr changes in ttm_dma_page_put.
Huang Rui (4):
drm/ttm: add ttm_set_memory header
drm/ttm: clean up non-x86 definitions on ttm_page_alloc_dma drm/ttm: clean up non-x86 definitions on ttm_page_alloc drm/ttm: use set_pages_wb instead of set_memory_wb
drivers/gpu/drm/ttm/ttm_page_alloc.c | 54 +------------ drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 53 ++----------- include/drm/ttm/ttm_set_memory.h | 127 +++++++++++++++++++++++++++++++ 3 files changed, 133 insertions(+), 101 deletions(-) create mode 100644 include/drm/ttm/ttm_set_memory.h
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
A message that is not in the archive (sent off-list or not yet received): 1532597359-18191-1-git-send-email-ray.huang-5C7GfCeVMHo@public.gmane.org
PATCH 1/5 drm/ttm: Merge hugepage attr changes in ttm_dma_page_put.
From: Bas Nieuwenhuizen <[email protected]>
Every set_pages_array_wb call resulted in cross-core interrupts and TLB flushes. Merge more of them for less overhead.
This reduces the time needed to free a 1.6 GiB GTT WC buffer as part of Vulkan CTS from ~2 sec to < 0.25 sec. (Allocation still takes more than 2 sec though)
--- drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-)
drivers/gpu/drm/ttm/ttm_page_alloc_dma.c +23 -7
@@ -301,6 +301,25 @@ static int set_pages_array_uc(struct page **pages, int addrinarray)#endif return 0 ; } + +static int ttm_set_page_range_wb (struct page *p,unsigned long numpages) +{ +#if IS_ENABLED (CONFIG_AGP ) +unsigned long i; + +for (i =0 ; i < numpages; i++) +unmap_page_from_agp (p + i); +#endif +return 0 ; +} + +#else /* for !CONFIG_X86 */ + +static int ttm_set_page_range_wb (struct page *p,unsigned long numpages) +{ +return set_memory_wb ((unsigned long )page_address (p), numpages); +} +#endif /* for !CONFIG_X86 */ static int ttm_set_pages_caching(struct dma_pool *pool,
@@ -389,17 +408,14 @@ static void ttm_pool_update_free_locked(struct dma_pool *pool,static void ttm_dma_page_put (struct dma_pool *pool,struct dma_page *d_page) {struct page *page = d_page->p; -unsigned i, num_pages; +unsigned num_pages;/* Don't set WB on WB page pool. */ if (!(pool->type &IS_CACHED )) { num_pages = pool->size /PAGE_SIZE ; -for (i =0 ; i < num_pages; ++i, ++page) { -if (set_pages_array_wb (&page,1 )) { -pr_err ("%s: Failed to set %d pages to wb!\n" , - pool->dev_name,1 ); - } - } +if (ttm_set_page_range_wb (page, num_pages)) +pr_err ("%s: Failed to set %d pages to wb!\n" , + pool->dev_name, num_pages); }list_del (&d_page->page_list);
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx