diff options
author | Thomas Hellstrom <thellstrom@vmware.com> | 2010-05-26 10:21:03 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-05-31 19:39:48 -0400 |
commit | e8613c0e29d0018a80652e6ae58660c8a75ac74b (patch) | |
tree | e81cd1dcf06946ea1eb1c36943a3073c13c65c8b /drivers/gpu | |
parent | cf22f20ade30f8c03955324aaf27b1049e182600 (diff) |
drm/ttm: Fix cached TTM page allocation.
This patch fixes a regression introduced with the pool page allocator
in the event that there are no highmem pages (for example x86_64),
in which case cached page allocation would fail.
Tested with the vmwgfx driver on a 64-bit vm.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/ttm/ttm_page_alloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c index 0d9a42c2394f..b6d152360675 100644 --- a/drivers/gpu/drm/ttm/ttm_page_alloc.c +++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c | |||
@@ -671,7 +671,7 @@ int ttm_get_pages(struct list_head *pages, int flags, | |||
671 | if (flags & TTM_PAGE_FLAG_DMA32) | 671 | if (flags & TTM_PAGE_FLAG_DMA32) |
672 | gfp_flags |= GFP_DMA32; | 672 | gfp_flags |= GFP_DMA32; |
673 | else | 673 | else |
674 | gfp_flags |= __GFP_HIGHMEM; | 674 | gfp_flags |= GFP_HIGHUSER; |
675 | 675 | ||
676 | for (r = 0; r < count; ++r) { | 676 | for (r = 0; r < count; ++r) { |
677 | p = alloc_page(gfp_flags); | 677 | p = alloc_page(gfp_flags); |