diff options
Diffstat (limited to 'drivers/char/agp/amd64-agp.c')
-rw-r--r-- | drivers/char/agp/amd64-agp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c index e85a5b3e952..2fb2e6cc322 100644 --- a/drivers/char/agp/amd64-agp.c +++ b/drivers/char/agp/amd64-agp.c | |||
@@ -79,7 +79,7 @@ static int amd64_insert_memory(struct agp_memory *mem, off_t pg_start, int type) | |||
79 | 79 | ||
80 | for (i = 0, j = pg_start; i < mem->page_count; i++, j++) { | 80 | for (i = 0, j = pg_start; i < mem->page_count; i++, j++) { |
81 | tmp = agp_bridge->driver->mask_memory(agp_bridge, | 81 | tmp = agp_bridge->driver->mask_memory(agp_bridge, |
82 | phys_to_gart(page_to_phys(mem->pages[i])), | 82 | page_to_phys(mem->pages[i]), |
83 | mask_type); | 83 | mask_type); |
84 | 84 | ||
85 | BUG_ON(tmp & 0xffffff0000000ffcULL); | 85 | BUG_ON(tmp & 0xffffff0000000ffcULL); |
@@ -178,7 +178,7 @@ static const struct aper_size_info_32 amd_8151_sizes[7] = | |||
178 | 178 | ||
179 | static int amd_8151_configure(void) | 179 | static int amd_8151_configure(void) |
180 | { | 180 | { |
181 | unsigned long gatt_bus = virt_to_gart(agp_bridge->gatt_table_real); | 181 | unsigned long gatt_bus = virt_to_phys(agp_bridge->gatt_table_real); |
182 | int i; | 182 | int i; |
183 | 183 | ||
184 | /* Configure AGP regs in each x86-64 host bridge. */ | 184 | /* Configure AGP regs in each x86-64 host bridge. */ |
@@ -558,7 +558,7 @@ static void __devexit agp_amd64_remove(struct pci_dev *pdev) | |||
558 | { | 558 | { |
559 | struct agp_bridge_data *bridge = pci_get_drvdata(pdev); | 559 | struct agp_bridge_data *bridge = pci_get_drvdata(pdev); |
560 | 560 | ||
561 | release_mem_region(virt_to_gart(bridge->gatt_table_real), | 561 | release_mem_region(virt_to_phys(bridge->gatt_table_real), |
562 | amd64_aperture_sizes[bridge->aperture_size_idx].size); | 562 | amd64_aperture_sizes[bridge->aperture_size_idx].size); |
563 | agp_remove_bridge(bridge); | 563 | agp_remove_bridge(bridge); |
564 | agp_put_bridge(bridge); | 564 | agp_put_bridge(bridge); |