Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9326d61b authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Revert "reduce tlb/cache flush times of agpgart memory allocation" 

This reverts commit 466ae837.
parent 5843d9a4

drivers/char/agp/agp.h

+0 −4
Original line number Diff line number Diff line
@@ -30,10 +30,6 @@ 
#define _AGP_BACKEND_PRIV_H 1



#include <asm/agp.h>	/* for flush_agp_cache() */

#ifndef map_page_into_agp_noflush

#define map_page_into_agp_noflush(page) map_page_into_agp(page)

#define map_page_into_agp_global_flush()

#endif



#define PFX "agpgart: "

drivers/char/agp/generic.c

+1 −3
Original line number Diff line number Diff line
@@ -274,7 +274,6 @@ struct agp_memory *agp_allocate_memory(struct agp_bridge_data *bridge, 
		new->memory[i] = virt_to_gart(addr);

		new->page_count++;

	}

	map_page_into_agp_global_flush();

	new->bridge = bridge;



	return new;
@@ -1187,8 +1186,7 @@ void *agp_generic_alloc_page(struct agp_bridge_data *bridge) 
	if (page == NULL)

		return NULL;



	/* agp_allocate_memory will do flush */

	map_page_into_agp_noflush(page);

	map_page_into_agp(page);



	get_page(page);

	atomic_inc(&agp_bridge->current_memory_agp);

include/asm-x86/agp.h

+0 −3
Original line number Diff line number Diff line
@@ -15,9 +15,6 @@ 
#define map_page_into_agp(page) set_pages_uc(page, 1)

#define unmap_page_from_agp(page) set_pages_wb(page, 1)



#define map_page_into_agp_noflush(page) set_pages_uc_noflush(page, 1)

#define map_page_into_agp_global_flush() set_memory_flush_all()



/*

 * Could use CLFLUSH here if the cpu supports it. But then it would

 * need to be called for each cacheline of the whole page so it may