Commit a030ce44 authored by Thomas Hellstrom's avatar Thomas Hellstrom Committed by Dave Jones
Browse files

[AGPGART] Allow drm-populated agp memory types 



This patch allows drm to populate an agpgart structure with pages of its own.
It's needed for the new drm memory manager which dynamically flips pages in and out of AGP.

The patch modifies the generic functions as well as the intel agp driver. The intel drm driver is
currently the only one supporting the new memory manager.

Other agp drivers may need some minor fixing up once they have a corresponding memory manager enabled drm driver.

AGP memory types >= AGP_USER_TYPES are not populated by the agpgart driver, but the drm is expected
to do that, as well as taking care of cache- and tlb flushing when needed.

It's not possible to request these types from user space using agpgart ioctls.

The Intel driver also gets a new memory type for pages that can be bound cached to the intel GTT.

Signed-off-by: default avatarThomas Hellstrom <thomas@tungstengraphics.com>
Signed-off-by: default avatarDave Jones <davej@redhat.com>
parent 0316fe83

drivers/char/agp/agp.h

+10 −0
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ struct agp_bridge_driver { 
	void (*free_by_type)(struct agp_memory *);

	void *(*agp_alloc_page)(struct agp_bridge_data *);

	void (*agp_destroy_page)(void *);

        int (*agp_type_to_mask_type) (struct agp_bridge_data *, int);

};



struct agp_bridge_data {
@@ -218,6 +219,7 @@ struct agp_bridge_data { 
#define I810_PTE_MAIN_UNCACHED	0x00000000

#define I810_PTE_LOCAL		0x00000002

#define I810_PTE_VALID		0x00000001

#define I830_PTE_SYSTEM_CACHED  0x00000006

#define I810_SMRAM_MISCC	0x70

#define I810_GFX_MEM_WIN_SIZE	0x00010000

#define I810_GFX_MEM_WIN_32M	0x00010000
@@ -270,8 +272,16 @@ void global_cache_flush(void); 
void get_agp_version(struct agp_bridge_data *bridge);

unsigned long agp_generic_mask_memory(struct agp_bridge_data *bridge,

	unsigned long addr, int type);

int agp_generic_type_to_mask_type(struct agp_bridge_data *bridge,

				  int type);

struct agp_bridge_data *agp_generic_find_bridge(struct pci_dev *pdev);



/* generic functions for user-populated AGP memory types */

struct agp_memory *agp_generic_alloc_user(size_t page_count, int type);

void agp_alloc_page_array(size_t size, struct agp_memory *mem);

void agp_free_page_array(struct agp_memory *mem);





/* generic routines for agp>=3 */

int agp3_generic_fetch_size(void);

void agp3_generic_tlbflush(struct agp_memory *mem);

drivers/char/agp/ali-agp.c

+2 −0
Original line number Diff line number Diff line
@@ -214,6 +214,7 @@ static struct agp_bridge_driver ali_generic_bridge = { 
	.free_by_type		= agp_generic_free_by_type,

	.agp_alloc_page		= agp_generic_alloc_page,

	.agp_destroy_page	= ali_destroy_page,

	.agp_type_to_mask_type  = agp_generic_type_to_mask_type,

};



static struct agp_bridge_driver ali_m1541_bridge = {
@@ -237,6 +238,7 @@ static struct agp_bridge_driver ali_m1541_bridge = { 
	.free_by_type		= agp_generic_free_by_type,

	.agp_alloc_page		= m1541_alloc_page,

	.agp_destroy_page	= m1541_destroy_page,

	.agp_type_to_mask_type  = agp_generic_type_to_mask_type,

};

drivers/char/agp/alpha-agp.c

+4 −0
Original line number Diff line number Diff line
@@ -91,6 +91,9 @@ static int alpha_core_agp_insert_memory(struct agp_memory *mem, off_t pg_start, 
	int num_entries, status;

	void *temp;



	if (type >= AGP_USER_TYPES || mem->type >= AGP_USER_TYPES)

		return -EINVAL;



	temp = agp_bridge->current_size;

	num_entries = A_SIZE_FIX(temp)->num_entries;

	if ((pg_start + mem->page_count) > num_entries)
@@ -142,6 +145,7 @@ struct agp_bridge_driver alpha_core_agp_driver = { 
	.free_by_type		= agp_generic_free_by_type,

	.agp_alloc_page		= agp_generic_alloc_page,

	.agp_destroy_page	= agp_generic_destroy_page,

	.agp_type_to_mask_type  = agp_generic_type_to_mask_type,

};



struct agp_bridge_data *alpha_bridge;

drivers/char/agp/amd-k7-agp.c

+1 −0
Original line number Diff line number Diff line
@@ -381,6 +381,7 @@ static struct agp_bridge_driver amd_irongate_driver = { 
	.free_by_type		= agp_generic_free_by_type,

	.agp_alloc_page		= agp_generic_alloc_page,

	.agp_destroy_page	= agp_generic_destroy_page,

	.agp_type_to_mask_type  = agp_generic_type_to_mask_type,

};



static struct agp_device_ids amd_agp_device_ids[] __devinitdata =

drivers/char/agp/amd64-agp.c

+9 −2
Original line number Diff line number Diff line
@@ -62,12 +62,18 @@ static int amd64_insert_memory(struct agp_memory *mem, off_t pg_start, int type) 
{

	int i, j, num_entries;

	long long tmp;

	int mask_type;

	struct agp_bridge_data *bridge = mem->bridge;

	u32 pte;



	num_entries = agp_num_entries();



	if (type != 0 || mem->type != 0)

	if (type != mem->type)

		return -EINVAL;

	mask_type = bridge->driver->agp_type_to_mask_type(bridge, type);

	if (mask_type != 0)

		return -EINVAL;





	/* Make sure we can fit the range in the gatt table. */

	/* FIXME: could wrap */
@@ -90,7 +96,7 @@ static int amd64_insert_memory(struct agp_memory *mem, off_t pg_start, int type) 


	for (i = 0, j = pg_start; i < mem->page_count; i++, j++) {

		tmp = agp_bridge->driver->mask_memory(agp_bridge,

			mem->memory[i], mem->type);

			mem->memory[i], mask_type);



		BUG_ON(tmp & 0xffffff0000000ffcULL);

		pte = (tmp & 0x000000ff00000000ULL) >> 28;
@@ -247,6 +253,7 @@ static struct agp_bridge_driver amd_8151_driver = { 
	.free_by_type		= agp_generic_free_by_type,

	.agp_alloc_page		= agp_generic_alloc_page,

	.agp_destroy_page	= agp_generic_destroy_page,

	.agp_type_to_mask_type  = agp_generic_type_to_mask_type,

};



/* Some basic sanity checks for the aperture. */

CRA Git | Maintained and supported by SUSTech CRA and CCSE