aboutsummaryrefslogtreecommitdiff
path: root/linux-core/drm_vm.c
diff options
context:
space:
mode:
authorThomas Hellstrom <thomas-at-tungstengraphics-dot-com>2006-12-27 15:32:09 +0100
committerThomas Hellstrom <thomas-at-tungstengraphics-dot-com>2006-12-27 15:32:09 +0100
commit975136d6e5adc6b6a03719499cf39fbd3f67dc90 (patch)
tree86767019ee5da639391837d2a570e9a5e4fa3c41 /linux-core/drm_vm.c
parentc38ede06670b47620bbce33c5a4affd063769475 (diff)
Proper allocation of AGP pages for ttms.
Diffstat (limited to 'linux-core/drm_vm.c')
-rw-r--r--linux-core/drm_vm.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/linux-core/drm_vm.c b/linux-core/drm_vm.c
index f36218e9..7ac7f3c0 100644
--- a/linux-core/drm_vm.c
+++ b/linux-core/drm_vm.c
@@ -208,7 +208,8 @@ struct page *drm_vm_ttm_fault(struct vm_area_struct *vma,
data->type = VM_FAULT_OOM;
goto out;
}
- page = ttm->pages[page_offset] = drm_alloc_gatt_pages(0);
+ page = ttm->pages[page_offset] =
+ alloc_page(GFP_KERNEL | __GFP_ZERO | GFP_DMA32);
if (!page) {
drm_free_memctl(PAGE_SIZE);
data->type = VM_FAULT_OOM;
@@ -220,8 +221,6 @@ struct page *drm_vm_ttm_fault(struct vm_area_struct *vma,
#else
SetPageReserved(page);
#endif
- clear_page(kmap(page));
- kunmap(page);
}
if (ttm->page_flags & DRM_TTM_PAGE_UNCACHED) {