drm/ttm: fix missed conversion of set_pages_array_uc
Subsystems (3)
PATCH 1/3 drm/ttm: fix missed conversion of set_pages_array_uc
This patch fixed the error when do not configure CONFIG_X86, otherwise, below error will be encountered.
All errors (new ones prefixed by >>):
drivers/gpu/drm/ttm/ttm_page_alloc_dma.c: In function 'ttm_set_pages_caching':
Quoted 1 line
Quoted 1 line
drivers/gpu/drm/ttm/ttm_page_alloc_dma.c:272:7: error: implicit declaration of function 'set_pages_array_uc'; did you mean
+'ttm_set_pages_array_uc'? [-Werror=implicit-function-declaration]
r = set_pages_array_uc(pages, cpages);
^~~~~~~~~~~~~~~~~~
ttm_set_pages_array_uccc1: some warnings being treated as errors
--- drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/ttm/ttm_page_alloc_dma.c +1 -1
@@ -269,7 +269,7 @@ static int ttm_set_pages_caching(struct dma_pool *pool,int r =0 ;/* Set page caching */ if (pool->type &IS_UC ) { - r =set_pages_array_uc (pages, cpages); + r =ttm_set_pages_array_uc (pages, cpages);if (r)pr_err ("%s: Failed to set %d pages to uc!\n" , pool->dev_name, cpages);
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/3 drm/ttm: Add ttm_set_pages_wc and ttm_set_pages_uc helper
These two helpers will be used on set page caching.
--- include/drm/ttm/ttm_set_memory.h | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
include/drm/ttm/ttm_set_memory.h +22 -0
@@ -57,6 +57,18 @@ static inline int ttm_set_pages_wb(struct page *page, int numpages) return set_pages_wb(page, numpages); } +static inline int ttm_set_pages_wc (struct page *page,int numpages) +{ +unsigned long addr = (unsigned long )page_address (page); + +return set_memory_wc (addr, numpages); +} + +static inline int ttm_set_pages_uc (struct page *page,int numpages) +{ +return set_pages_uc (page, numpages); +} +#else /* for CONFIG_X86 */ #if IS_ENABLED (CONFIG_AGP )
@@ -123,6 +135,16 @@ static inline int ttm_set_pages_wb(struct page *page, int numpages)#endif /* for CONFIG_AGP */ +static inline int ttm_set_pages_wc (struct page *page,int numpages) +{ +return 0 ; +} + +static inline int ttm_set_pages_uc (struct page *page,int numpages) +{ +return 0 ; +} +#endif /* for CONFIG_X86 */ #endif
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): 1533102573-15365-1-git-send-email-ray.huang-5C7GfCeVMHo@public.gmane.org
PATCH 3/3 drm/ttm: clean up non-x86 definitions on ttm_tt
All non-x86 definitions are moved to ttm_set_memory header, so remove it from ttm_tt.c.
--- drivers/gpu/drm/ttm/ttm_tt.c | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-)
drivers/gpu/drm/ttm/ttm_tt.c +7 -18
@@ -38,9 +38,7 @@#include <drm/drm_cache.h> #include <drm/ttm/ttm_bo_driver.h> #include <drm/ttm/ttm_page_alloc.h> -#ifdef CONFIG_X86 -#include <asm/set_memory.h> -#endif +#include <drm/ttm/ttm_set_memory.h> /** * Allocates a ttm structure for the given BO.
@@ -115,10 +113,9 @@ static int ttm_sg_tt_alloc_page_directory(struct ttm_dma_tt *ttm)return 0 ; } -#ifdef CONFIG_X86 -static inline int ttm_tt_set_page_caching (struct page *p, -enum ttm_caching_state c_old, -enum ttm_caching_state c_new) +static int ttm_tt_set_page_caching (struct page *p, +enum ttm_caching_state c_old, +enum ttm_caching_state c_new) {int ret =0 ;
@@ -129,26 +126,18 @@ static inline int ttm_tt_set_page_caching(struct page *p,/* p isn't in the default caching state, set it to * writeback first to free its current memtype. */ - ret =set_pages_wb (p,1 ); + ret =ttm_set_pages_wb (p,1 );if (ret)return ret; }if (c_new == tt_wc) - ret =set_memory_wc ((unsigned long )page_address (p),1 ); + ret =ttm_set_pages_wc (p,1 );else if (c_new == tt_uncached) - ret =set_pages_uc (p,1 ); + ret =ttm_set_pages_uc (p,1 );return ret; } -#else /* CONFIG_X86 */ -static inline int ttm_tt_set_page_caching (struct page *p, -enum ttm_caching_state c_old, -enum ttm_caching_state c_new) -{ -return 0 ; -} -#endif /* CONFIG_X86 */ /* * Change caching policy for the linear kernel map
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Christian König
Reviewed-byAm 01.08.2018 um 07:49 schrieb Huang Rui:
Quoted 7 lines
This patch fixed the error when do not configure
CONFIG_X86, otherwise, below error will be encountered.All errors (new ones prefixed by >>):
drivers/gpu/drm/ttm/ttm_page_alloc_dma.c: In function 'ttm_set_pages_caching':Quoted 1 line
Quoted 1 line
drivers/gpu/drm/ttm/ttm_page_alloc_dma.c:272:7: error: implicit declaration of function 'set_pages_array_uc'; did you mean
Quoted 8 lines
+'ttm_set_pages_array_uc'? [-Werror=implicit-function-declaration]
r = set_pages_array_uc(pages, cpages); ^~~~~~~~~~~~~~~~~~ ttm_set_pages_array_uc cc1: some warnings being treated as errorsReported-by kbuild test robot <[email protected]>Signed-off-by Huang Rui <[email protected]>
Quoted 9 lines
--- drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/ttm/ttm_page_alloc_dma.c +0
-0
drivers/gpu/drm/ttm/ttm_page_alloc_dma.c static int ttm_set_pages_caching(struct dma_pool *pool, · line 275
Quoted 8 lines
drivers/gpu/drm/ttm/ttm_page_alloc_dma.c +1
-1@@ -269,7 +269,7 @@ static int ttm_set_pages_caching(struct dma_pool *pool,int r =0 ;/* Set page caching */ if (pool->type &IS_UC ) { - r =set_pages_array_uc (pages, cpages); + r =ttm_set_pages_array_uc (pages, cpages);if (r)pr_err ("%s: Failed to set %d pages to uc!\n" , pool->dev_name, cpages);
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx