Commit b42db2b1 authored by Dave Airlie's avatar Dave Airlie

drm/ttm: fix highuser vs dma32 confusion.

DMA32 and highmem are sort of exclusive.

Noticed by AndrewR on #radeon.
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent ea3c13bd
...@@ -137,13 +137,15 @@ static void ttm_tt_free_page_directory(struct ttm_tt *ttm) ...@@ -137,13 +137,15 @@ static void ttm_tt_free_page_directory(struct ttm_tt *ttm)
static struct page *ttm_tt_alloc_page(unsigned page_flags) static struct page *ttm_tt_alloc_page(unsigned page_flags)
{ {
gfp_t gfp_flags = GFP_HIGHUSER; gfp_t gfp_flags = GFP_USER;
if (page_flags & TTM_PAGE_FLAG_ZERO_ALLOC) if (page_flags & TTM_PAGE_FLAG_ZERO_ALLOC)
gfp_flags |= __GFP_ZERO; gfp_flags |= __GFP_ZERO;
if (page_flags & TTM_PAGE_FLAG_DMA32) if (page_flags & TTM_PAGE_FLAG_DMA32)
gfp_flags |= __GFP_DMA32; gfp_flags |= __GFP_DMA32;
else
gfp_flags |= __GFP_HIGHMEM;
return alloc_page(gfp_flags); return alloc_page(gfp_flags);
} }
......
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