x86: remove flush_agp_mappings()
Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
parent
d7c8f21a8c
commit
5398f9854f
|
@ -147,7 +147,6 @@ static int agp_backend_initialize(struct agp_bridge_data *bridge)
|
||||||
printk(KERN_ERR PFX "unable to get memory for scratch page.\n");
|
printk(KERN_ERR PFX "unable to get memory for scratch page.\n");
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
flush_agp_mappings();
|
|
||||||
|
|
||||||
bridge->scratch_page_real = virt_to_gart(addr);
|
bridge->scratch_page_real = virt_to_gart(addr);
|
||||||
bridge->scratch_page =
|
bridge->scratch_page =
|
||||||
|
@ -191,7 +190,6 @@ err_out:
|
||||||
if (bridge->driver->needs_scratch_page) {
|
if (bridge->driver->needs_scratch_page) {
|
||||||
bridge->driver->agp_destroy_page(gart_to_virt(bridge->scratch_page_real),
|
bridge->driver->agp_destroy_page(gart_to_virt(bridge->scratch_page_real),
|
||||||
AGP_PAGE_DESTROY_UNMAP);
|
AGP_PAGE_DESTROY_UNMAP);
|
||||||
flush_agp_mappings();
|
|
||||||
bridge->driver->agp_destroy_page(gart_to_virt(bridge->scratch_page_real),
|
bridge->driver->agp_destroy_page(gart_to_virt(bridge->scratch_page_real),
|
||||||
AGP_PAGE_DESTROY_FREE);
|
AGP_PAGE_DESTROY_FREE);
|
||||||
}
|
}
|
||||||
|
@ -219,7 +217,6 @@ static void agp_backend_cleanup(struct agp_bridge_data *bridge)
|
||||||
bridge->driver->needs_scratch_page) {
|
bridge->driver->needs_scratch_page) {
|
||||||
bridge->driver->agp_destroy_page(gart_to_virt(bridge->scratch_page_real),
|
bridge->driver->agp_destroy_page(gart_to_virt(bridge->scratch_page_real),
|
||||||
AGP_PAGE_DESTROY_UNMAP);
|
AGP_PAGE_DESTROY_UNMAP);
|
||||||
flush_agp_mappings();
|
|
||||||
bridge->driver->agp_destroy_page(gart_to_virt(bridge->scratch_page_real),
|
bridge->driver->agp_destroy_page(gart_to_virt(bridge->scratch_page_real),
|
||||||
AGP_PAGE_DESTROY_FREE);
|
AGP_PAGE_DESTROY_FREE);
|
||||||
}
|
}
|
||||||
|
|
|
@ -197,7 +197,6 @@ void agp_free_memory(struct agp_memory *curr)
|
||||||
for (i = 0; i < curr->page_count; i++) {
|
for (i = 0; i < curr->page_count; i++) {
|
||||||
curr->bridge->driver->agp_destroy_page(gart_to_virt(curr->memory[i]), AGP_PAGE_DESTROY_UNMAP);
|
curr->bridge->driver->agp_destroy_page(gart_to_virt(curr->memory[i]), AGP_PAGE_DESTROY_UNMAP);
|
||||||
}
|
}
|
||||||
flush_agp_mappings();
|
|
||||||
for (i = 0; i < curr->page_count; i++) {
|
for (i = 0; i < curr->page_count; i++) {
|
||||||
curr->bridge->driver->agp_destroy_page(gart_to_virt(curr->memory[i]), AGP_PAGE_DESTROY_FREE);
|
curr->bridge->driver->agp_destroy_page(gart_to_virt(curr->memory[i]), AGP_PAGE_DESTROY_FREE);
|
||||||
}
|
}
|
||||||
|
@ -267,8 +266,6 @@ struct agp_memory *agp_allocate_memory(struct agp_bridge_data *bridge,
|
||||||
}
|
}
|
||||||
new->bridge = bridge;
|
new->bridge = bridge;
|
||||||
|
|
||||||
flush_agp_mappings();
|
|
||||||
|
|
||||||
return new;
|
return new;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(agp_allocate_memory);
|
EXPORT_SYMBOL(agp_allocate_memory);
|
||||||
|
|
|
@ -7,7 +7,6 @@
|
||||||
|
|
||||||
#define map_page_into_agp(page)
|
#define map_page_into_agp(page)
|
||||||
#define unmap_page_from_agp(page)
|
#define unmap_page_from_agp(page)
|
||||||
#define flush_agp_mappings()
|
|
||||||
#define flush_agp_cache() mb()
|
#define flush_agp_cache() mb()
|
||||||
|
|
||||||
/* Convert a physical address to an address suitable for the GART. */
|
/* Convert a physical address to an address suitable for the GART. */
|
||||||
|
|
|
@ -15,7 +15,6 @@
|
||||||
*/
|
*/
|
||||||
#define map_page_into_agp(page) /* nothing */
|
#define map_page_into_agp(page) /* nothing */
|
||||||
#define unmap_page_from_agp(page) /* nothing */
|
#define unmap_page_from_agp(page) /* nothing */
|
||||||
#define flush_agp_mappings() /* nothing */
|
|
||||||
#define flush_agp_cache() mb()
|
#define flush_agp_cache() mb()
|
||||||
|
|
||||||
/* Convert a physical address to an address suitable for the GART. */
|
/* Convert a physical address to an address suitable for the GART. */
|
||||||
|
|
|
@ -9,7 +9,6 @@
|
||||||
|
|
||||||
#define map_page_into_agp(page) /* nothing */
|
#define map_page_into_agp(page) /* nothing */
|
||||||
#define unmap_page_from_agp(page) /* nothing */
|
#define unmap_page_from_agp(page) /* nothing */
|
||||||
#define flush_agp_mappings() /* nothing */
|
|
||||||
#define flush_agp_cache() mb()
|
#define flush_agp_cache() mb()
|
||||||
|
|
||||||
/* Convert a physical address to an address suitable for the GART. */
|
/* Convert a physical address to an address suitable for the GART. */
|
||||||
|
|
|
@ -6,7 +6,6 @@
|
||||||
|
|
||||||
#define map_page_into_agp(page)
|
#define map_page_into_agp(page)
|
||||||
#define unmap_page_from_agp(page)
|
#define unmap_page_from_agp(page)
|
||||||
#define flush_agp_mappings()
|
|
||||||
#define flush_agp_cache() mb()
|
#define flush_agp_cache() mb()
|
||||||
|
|
||||||
/* Convert a physical address to an address suitable for the GART. */
|
/* Convert a physical address to an address suitable for the GART. */
|
||||||
|
|
|
@ -5,7 +5,6 @@
|
||||||
|
|
||||||
#define map_page_into_agp(page)
|
#define map_page_into_agp(page)
|
||||||
#define unmap_page_from_agp(page)
|
#define unmap_page_from_agp(page)
|
||||||
#define flush_agp_mappings()
|
|
||||||
#define flush_agp_cache() mb()
|
#define flush_agp_cache() mb()
|
||||||
|
|
||||||
/* Convert a physical address to an address suitable for the GART. */
|
/* Convert a physical address to an address suitable for the GART. */
|
||||||
|
|
|
@ -14,7 +14,6 @@
|
||||||
|
|
||||||
#define map_page_into_agp(page) set_pages_uc(page, 1)
|
#define map_page_into_agp(page) set_pages_uc(page, 1)
|
||||||
#define unmap_page_from_agp(page) set_pages_wb(page, 1)
|
#define unmap_page_from_agp(page) set_pages_wb(page, 1)
|
||||||
#define flush_agp_mappings() do { } while (0)
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Could use CLFLUSH here if the cpu supports it. But then it would
|
* Could use CLFLUSH here if the cpu supports it. But then it would
|
||||||
|
|
Loading…
Reference in New Issue