From: Christian König Date: Thu, 4 Jan 2018 14:09:39 +0000 (+0100) Subject: drm/ttm: specify DMA_ATTR_NO_WARN for huge page pools X-Git-Tag: v4.19~1610^2~10^2~9 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=40b4667babaf73218e62cd73a17184a7c2d50434;p=platform%2Fkernel%2Flinux-rpi3.git drm/ttm: specify DMA_ATTR_NO_WARN for huge page pools Suppress warning messages when allocating huge pages fails since we can always fall back to normal pages. Signed-off-by: Christian König Acked-by: Alex Deucher Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c index 3ac5391..4c65940 100644 --- a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c +++ b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c @@ -333,14 +333,18 @@ static void __ttm_dma_free_page(struct dma_pool *pool, struct dma_page *d_page) static struct dma_page *__ttm_dma_alloc_page(struct dma_pool *pool) { struct dma_page *d_page; + unsigned long attrs = 0; void *vaddr; d_page = kmalloc(sizeof(struct dma_page), GFP_KERNEL); if (!d_page) return NULL; - vaddr = dma_alloc_coherent(pool->dev, pool->size, &d_page->dma, - pool->gfp_flags); + if (pool->type & IS_HUGE) + attrs = DMA_ATTR_NO_WARN; + + vaddr = dma_alloc_attrs(pool->dev, pool->size, &d_page->dma, + pool->gfp_flags, attrs); if (vaddr) { if (is_vmalloc_addr(vaddr)) d_page->p = vmalloc_to_page(vaddr);