Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b42db2b1 authored by Dave Airlie's avatar Dave Airlie
Browse files

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

drivers/gpu/drm/ttm/ttm_tt.c

+3 −1
Original line number Diff line number Diff line
@@ -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)

{

	gfp_t gfp_flags = GFP_HIGHUSER;

	gfp_t gfp_flags = GFP_USER;



	if (page_flags & TTM_PAGE_FLAG_ZERO_ALLOC)

		gfp_flags |= __GFP_ZERO;



	if (page_flags & TTM_PAGE_FLAG_DMA32)

		gfp_flags |= __GFP_DMA32;

	else

		gfp_flags |= __GFP_HIGHMEM;



	return alloc_page(gfp_flags);

}