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

Commit f8abea8f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart 

* master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart:
  [AGPGART] allow drm populated agp memory types cleanups
  [AGPGART] intel-agp: Use ARRAY_SIZE macro when appropriate
  [AGPGART] Add agp-type-to-mask-type method missing from some drivers.
  [AGPGART] Don't try to remap i810 registers on resume.
  [AGPGART] Allow drm-populated agp memory types
  [AGPGART] compat ioctl
parents ef294986 1c14cfbb

drivers/char/agp/Makefile

+1 −0
Original line number Diff line number Diff line 
agpgart-y := backend.o frontend.o generic.o isoch.o



obj-$(CONFIG_AGP)		+= agpgart.o

obj-$(CONFIG_COMPAT)		+= compat_ioctl.o

obj-$(CONFIG_AGP_ALI)		+= ali-agp.o

obj-$(CONFIG_AGP_ATI)		+= ati-agp.o

obj-$(CONFIG_AGP_AMD)		+= amd-k7-agp.o

drivers/char/agp/agp.h

+12 −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);
@@ -288,6 +298,8 @@ extern struct aper_size_info_16 agp3_generic_sizes[]; 
extern int agp_off;

extern int agp_try_unsupported_boot;



long compat_agp_ioctl(struct file *file, unsigned int cmd, unsigned long arg);



/* Chipset independant registers (from AGP Spec) */

#define AGP_APBASE	0x10

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 =