diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-07-29 06:56:52 (GMT) |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-07-29 06:56:52 (GMT) |
| commit | b42db2b12df7b4f7b2ace581a7726cb5bcb2d658 (patch) | |
| tree | e5df5aed1a2dc88e6b1eb659eea881706ad00239 /drivers/gpu/drm | |
| parent | ea3c13bd8c2ed1d3670bd72e60f562a427355fdf (diff) | |
| download | linux-fsl-qoriq-b42db2b12df7b4f7b2ace581a7726cb5bcb2d658.tar.xz | |
drm/ttm: fix highuser vs dma32 confusion.
DMA32 and highmem are sort of exclusive.
Noticed by AndrewR on #radeon.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/ttm/ttm_tt.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c index 9b2248a..b8b6c4a 100644 --- a/drivers/gpu/drm/ttm/ttm_tt.c +++ b/drivers/gpu/drm/ttm/ttm_tt.c @@ -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); } |