diff options
| author |   Tony Luck <tony.luck@intel.com> | 2005-06-15 14:06:48 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-15 14:06:48 -0700 |
| commit | f2cbb4f01936a3e4225692e03b084b78c56d386d (patch) | |
| tree | f89f3d8baa250589a38a4dd2df56f84cddae3c76 /drivers/char/agp/backend.c | |
| parent | Merge with temp tree to get David's gdb inferior calls patch (diff) | |
| parent | [PATCH] update ppc64 defconfig (diff) | |
| download | linux-dev-f2cbb4f01936a3e4225692e03b084b78c56d386d.tar.xz linux-dev-f2cbb4f01936a3e4225692e03b084b78c56d386d.zip | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'drivers/char/agp/backend.c')
| -rw-r--r-- | drivers/char/agp/backend.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/agp/backend.c b/drivers/char/agp/backend.c index 2f3dfb63bdc6..4d4e602fdc7e 100644 --- a/drivers/char/agp/backend.c +++ b/drivers/char/agp/backend.c @@ -148,7 +148,7 @@ static int agp_backend_initialize(struct agp_bridge_data *bridge) return -ENOMEM; } - bridge->scratch_page_real = virt_to_phys(addr); + bridge->scratch_page_real = virt_to_gart(addr); bridge->scratch_page = bridge->driver->mask_memory(bridge, bridge->scratch_page_real, 0); } @@ -189,7 +189,7 @@ static int agp_backend_initialize(struct agp_bridge_data *bridge) err_out: if (bridge->driver->needs_scratch_page) bridge->driver->agp_destroy_page( - phys_to_virt(bridge->scratch_page_real)); + gart_to_virt(bridge->scratch_page_real)); if (got_gatt) bridge->driver->free_gatt_table(bridge); if (got_keylist) { @@ -214,7 +214,7 @@ static void agp_backend_cleanup(struct agp_bridge_data *bridge) if (bridge->driver->agp_destroy_page && bridge->driver->needs_scratch_page) bridge->driver->agp_destroy_page( - phys_to_virt(bridge->scratch_page_real)); + gart_to_virt(bridge->scratch_page_real)); } /* When we remove the global variable agp_bridge from all drivers |