diff options
| author | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2006-12-27 15:32:09 +0100 |
|---|---|---|
| committer | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2006-12-27 15:32:09 +0100 |
| commit | 975136d6e5adc6b6a03719499cf39fbd3f67dc90 (patch) | |
| tree | 86767019ee5da639391837d2a570e9a5e4fa3c41 /linux-core/drm_ttm.c | |
| parent | c38ede06670b47620bbce33c5a4affd063769475 (diff) | |
Proper allocation of AGP pages for ttms.
Diffstat (limited to 'linux-core/drm_ttm.c')
| -rw-r--r-- | linux-core/drm_ttm.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/linux-core/drm_ttm.c b/linux-core/drm_ttm.c index c32dfcf9..1c9b1cf7 100644 --- a/linux-core/drm_ttm.c +++ b/linux-core/drm_ttm.c @@ -193,7 +193,7 @@ int drm_destroy_ttm(drm_ttm_t * ttm) * End debugging. */ - drm_free_gatt_pages(*cur_page, 0); + __free_page(*cur_page); drm_free_memctl(PAGE_SIZE); --bm->cur_pages; } @@ -225,7 +225,7 @@ static int drm_ttm_populate(drm_ttm_t * ttm) if (drm_alloc_memctl(PAGE_SIZE)) { return -ENOMEM; } - page = drm_alloc_gatt_pages(0); + page = alloc_page(GFP_KERNEL | __GFP_ZERO | GFP_DMA32); if (!page) { drm_free_memctl(PAGE_SIZE); return -ENOMEM; @@ -235,8 +235,6 @@ static int drm_ttm_populate(drm_ttm_t * ttm) #else SetPageReserved(page); #endif - clear_page(kmap(page)); - kunmap(page); ttm->pages[i] = page; ++bm->cur_pages; } |