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/char/agp/backend.c | |
| parent | 2908826d045a89805714e0a3055a99dc40565d41 (diff) | |
| download | kernel_samsung_espresso10-07613ba2f464f59949266f4337b75b91eb610795.zip kernel_samsung_espresso10-07613ba2f464f59949266f4337b75b91eb610795.tar.gz kernel_samsung_espresso10-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/char/agp/backend.c')
| -rw-r--r-- | drivers/char/agp/backend.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/char/agp/backend.c b/drivers/char/agp/backend.c index 8c617ad..cfa5a64 100644 --- a/drivers/char/agp/backend.c +++ b/drivers/char/agp/backend.c @@ -141,17 +141,17 @@ static int agp_backend_initialize(struct agp_bridge_data *bridge) bridge->version = &agp_current_version; if (bridge->driver->needs_scratch_page) { - void *addr = bridge->driver->agp_alloc_page(bridge); + struct page *page = bridge->driver->agp_alloc_page(bridge); - if (!addr) { + if (!page) { dev_err(&bridge->dev->dev, "can't get memory for scratch page\n"); return -ENOMEM; } - bridge->scratch_page_real = virt_to_gart(addr); + bridge->scratch_page_real = phys_to_gart(page_to_phys(page)); bridge->scratch_page = - bridge->driver->mask_memory(bridge, bridge->scratch_page_real, 0); + bridge->driver->mask_memory(bridge, page, 0); } size_value = bridge->driver->fetch_size(); |