drm/ttm: specify DMA_ATTR_NO_WARN for huge page pools
authorChristian König <christian.koenig@amd.com>
Thu, 4 Jan 2018 14:09:39 +0000 (15:09 +0100)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 10 Jan 2018 20:44:51 +0000 (15:44 -0500)
Suppress warning messages when allocating huge pages fails since we can
always fall back to normal pages.

Signed-off-by: Christian König <christian.koenig@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/ttm/ttm_page_alloc_dma.c

index 3ac53918881e07e72d37303f5c3ddba052b9bbee..4c659405a008ab0094f666faa3d1c22215707e2b 100644 (file)
@@ -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);