diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-06-12 14:11:41 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-06-19 10:21:42 +1000 |
| commit | 07613ba2f464f59949266f4337b75b91eb610795 (patch) | |
| tree | 8e43a82571686492aba2269c2e7a49c323783af1 /drivers/gpu/drm/drm_vm.c | |
| parent | 2908826d045a89805714e0a3055a99dc40565d41 (diff) | |
| download | linux-07613ba2f464f59949266f4337b75b91eb610795.tar.bz2 | |
agp: switch AGP to use page array instead of unsigned long array
This switches AGP to use an array of pages for tracking the
pages allocated to the GART. This should enable GEM on PAE to work
a lot better as we can pass highmem pages to the PAT code and it will
do the right thing with them.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/drm_vm.c')
| -rw-r--r-- | drivers/gpu/drm/drm_vm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c index f95d03ac9784..7e1fbe5d4779 100644 --- a/drivers/gpu/drm/drm_vm.c +++ b/drivers/gpu/drm/drm_vm.c @@ -144,14 +144,14 @@ static int drm_do_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) * Get the page, inc the use count, and return it */ offset = (baddr - agpmem->bound) >> PAGE_SHIFT; - page = virt_to_page(__va(agpmem->memory->memory[offset])); + page = agpmem->memory->pages[offset]; get_page(page); vmf->page = page; DRM_DEBUG ("baddr = 0x%llx page = 0x%p, offset = 0x%llx, count=%d\n", (unsigned long long)baddr, - __va(agpmem->memory->memory[offset]), + agpmem->memory->pages[offset], (unsigned long long)offset, page_count(page)); return 0; |