Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart (a22a0fab) · Commits · e / devices / android_kernel_teracube_2e

drivers/char/agp/Makefile

+2 −1

Original line number	Original line	Diff line number	Diff line
	agpgart-y := backend.o frontend.o generic.o isoch.o		agpgart-y := backend.o frontend.o generic.o isoch.o

			agpgart-$(CONFIG_COMPAT) += compat_ioctl.o

	obj-$(CONFIG_AGP) += agpgart.o		obj-$(CONFIG_AGP) += agpgart.o
	obj-$(CONFIG_COMPAT) += compat_ioctl.o
	obj-$(CONFIG_AGP_ALI) += ali-agp.o		obj-$(CONFIG_AGP_ALI) += ali-agp.o
	obj-$(CONFIG_AGP_ATI) += ati-agp.o		obj-$(CONFIG_AGP_ATI) += ati-agp.o
	obj-$(CONFIG_AGP_AMD) += amd-k7-agp.o		obj-$(CONFIG_AGP_AMD) += amd-k7-agp.o

drivers/char/agp/agp.h

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -93,12 +93,12 @@ struct aper_size_info_fixed {

	struct agp_bridge_driver {		struct agp_bridge_driver {
	struct module *owner;		struct module *owner;
	void *aperture_sizes;		const void *aperture_sizes;
	int num_aperture_sizes;		int num_aperture_sizes;
	enum aper_size_type size_type;		enum aper_size_type size_type;
	int cant_use_aperture;		int cant_use_aperture;
	int needs_scratch_page;		int needs_scratch_page;
	struct gatt_mask *masks;		const struct gatt_mask *masks;
	int (*fetch_size)(void);		int (*fetch_size)(void);
	int (*configure)(void);		int (*configure)(void);
	void (agp_enable)(struct agp_bridge_data , u32);		void (agp_enable)(struct agp_bridge_data , u32);
	@@ -119,7 +119,7 @@ struct agp_bridge_driver {

	struct agp_bridge_data {		struct agp_bridge_data {
	const struct agp_version *version;		const struct agp_version *version;
	struct agp_bridge_driver *driver;		const struct agp_bridge_driver *driver;
	struct vm_operations_struct *vm_ops;		struct vm_operations_struct *vm_ops;
	void *previous_size;		void *previous_size;
	void *current_size;		void *current_size;
	@@ -290,7 +290,7 @@ void agp3_generic_cleanup(void);

	/* aperture sizes have been standardised since v3 */		/* aperture sizes have been standardised since v3 */
	#define AGP_GENERIC_SIZES_ENTRIES 11		#define AGP_GENERIC_SIZES_ENTRIES 11
	extern struct aper_size_info_16 agp3_generic_sizes[];		extern const struct aper_size_info_16 agp3_generic_sizes[];

	#define virt_to_gart(x) (phys_to_gart(virt_to_phys(x)))		#define virt_to_gart(x) (phys_to_gart(virt_to_phys(x)))
	#define gart_to_virt(x) (phys_to_virt(gart_to_phys(x)))		#define gart_to_virt(x) (phys_to_virt(gart_to_phys(x)))

drivers/char/agp/ali-agp.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -182,7 +182,7 @@ static void m1541_destroy_page(void * addr)

	/* Setup function */		/* Setup function */

	static struct aper_size_info_32 ali_generic_sizes[7] =		static const struct aper_size_info_32 ali_generic_sizes[7] =
	{		{
	{256, 65536, 6, 10},		{256, 65536, 6, 10},
	{128, 32768, 5, 9},		{128, 32768, 5, 9},
	@@ -193,7 +193,7 @@ static struct aper_size_info_32 ali_generic_sizes[7] =
	{4, 1024, 0, 3}		{4, 1024, 0, 3}
	};		};

	static struct agp_bridge_driver ali_generic_bridge = {		static const struct agp_bridge_driver ali_generic_bridge = {
	.owner = THIS_MODULE,		.owner = THIS_MODULE,
	.aperture_sizes = ali_generic_sizes,		.aperture_sizes = ali_generic_sizes,
	.size_type = U32_APER_SIZE,		.size_type = U32_APER_SIZE,
	@@ -217,7 +217,7 @@ static struct agp_bridge_driver ali_generic_bridge = {
	.agp_type_to_mask_type = agp_generic_type_to_mask_type,		.agp_type_to_mask_type = agp_generic_type_to_mask_type,
	};		};

	static struct agp_bridge_driver ali_m1541_bridge = {		static const struct agp_bridge_driver ali_m1541_bridge = {
	.owner = THIS_MODULE,		.owner = THIS_MODULE,
	.aperture_sizes = ali_generic_sizes,		.aperture_sizes = ali_generic_sizes,
	.size_type = U32_APER_SIZE,		.size_type = U32_APER_SIZE,

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

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -344,7 +344,7 @@ static int amd_remove_memory(struct agp_memory *mem, off_t pg_start, int type)
	return 0;		return 0;
	}		}

	static struct aper_size_info_lvl2 amd_irongate_sizes[7] =		static const struct aper_size_info_lvl2 amd_irongate_sizes[7] =
	{		{
	{2048, 524288, 0x0000000c},		{2048, 524288, 0x0000000c},
	{1024, 262144, 0x0000000a},		{1024, 262144, 0x0000000a},
	@@ -355,12 +355,12 @@ static struct aper_size_info_lvl2 amd_irongate_sizes[7] =
	{32, 8192, 0x00000000}		{32, 8192, 0x00000000}
	};		};

	static struct gatt_mask amd_irongate_masks[] =		static const struct gatt_mask amd_irongate_masks[] =
	{		{
	{.mask = 1, .type = 0}		{.mask = 1, .type = 0}
	};		};

	static struct agp_bridge_driver amd_irongate_driver = {		static const struct agp_bridge_driver amd_irongate_driver = {
	.owner = THIS_MODULE,		.owner = THIS_MODULE,
	.aperture_sizes = amd_irongate_sizes,		.aperture_sizes = amd_irongate_sizes,
	.size_type = LVL2_APER_SIZE,		.size_type = LVL2_APER_SIZE,

drivers/char/agp/amd64-agp.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -192,7 +192,7 @@ static u64 amd64_configure (struct pci_dev *hammer, u64 gatt_table)
	}		}


	static struct aper_size_info_32 amd_8151_sizes[7] =		static const struct aper_size_info_32 amd_8151_sizes[7] =
	{		{
	{2048, 524288, 9, 0x00000000 }, /* 0 0 0 0 0 0 */		{2048, 524288, 9, 0x00000000 }, /* 0 0 0 0 0 0 */
	{1024, 262144, 8, 0x00000400 }, /* 1 0 0 0 0 0 */		{1024, 262144, 8, 0x00000400 }, /* 1 0 0 0 0 0 */
	@@ -232,7 +232,7 @@ static void amd64_cleanup(void)
	}		}


	static struct agp_bridge_driver amd_8151_driver = {		static const struct agp_bridge_driver amd_8151_driver = {
	.owner = THIS_MODULE,		.owner = THIS_MODULE,
	.aperture_sizes = amd_8151_sizes,		.aperture_sizes = amd_8151_sizes,
	.size_type = U32_APER_SIZE,		.size_type = U32_APER_SIZE,