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

Commit 3506ba7b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6 

* 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6:
  agp/intel: cleanup some serious whitespace badness
  [AGP] intel_agp: Add support for Intel 4 series chipsets
  [AGP] intel_agp: extra stolen mem size available for IGD_GM chipset
  agp: more boolean conversions.
  drivers/char/agp - use bool
  agp: two-stage page destruction issue
  agp/via: fixup pci ids
parents f9d1c6ca 62c96b9d

drivers/char/agp/agp.h

+3 −3
Original line number Diff line number Diff line
@@ -99,8 +99,8 @@ struct agp_bridge_driver { 
	const void *aperture_sizes;

	int num_aperture_sizes;

	enum aper_size_type size_type;

	int cant_use_aperture;

	int needs_scratch_page;

	bool cant_use_aperture;

	bool needs_scratch_page;

	const struct gatt_mask *masks;

	int (*fetch_size)(void);

	int (*configure)(void);
@@ -278,7 +278,7 @@ void agp_generic_destroy_page(void *addr, int flags); 
void agp_free_key(int key);

int agp_num_entries(void);

u32 agp_collect_device_status(struct agp_bridge_data *bridge, u32 mode, u32 command);

void agp_device_command(u32 command, int agp_v3);

void agp_device_command(u32 command, bool agp_v3);

int agp_3_5_enable(struct agp_bridge_data *bridge);

void global_cache_flush(void);

void get_agp_version(struct agp_bridge_data *bridge);

drivers/char/agp/alpha-agp.c

+2 −2
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static void alpha_core_agp_enable(struct agp_bridge_data *bridge, u32 mode) 
	agp->mode.bits.enable = 1;

	agp->ops->configure(agp);



	agp_device_command(agp->mode.lw, 0);

	agp_device_command(agp->mode.lw, false);

}



static int alpha_core_agp_insert_memory(struct agp_memory *mem, off_t pg_start,
@@ -126,7 +126,7 @@ struct agp_bridge_driver alpha_core_agp_driver = { 
	.aperture_sizes		= alpha_core_agp_sizes,

	.num_aperture_sizes	= 1,

	.size_type		= FIXED_APER_SIZE,

	.cant_use_aperture	= 1,

	.cant_use_aperture	= true,

	.masks			= NULL,



	.fetch_size		= alpha_core_agp_fetch_size,

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

+2 −2
Original line number Diff line number Diff line
@@ -314,9 +314,9 @@ static int amd_insert_memory(struct agp_memory *mem, off_t pg_start, int type) 
		j++;

	}



	if (mem->is_flushed == FALSE) {

	if (!mem->is_flushed) {

		global_cache_flush();

		mem->is_flushed = TRUE;

		mem->is_flushed = true;

	}



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

drivers/char/agp/amd64-agp.c

+2 −2
Original line number Diff line number Diff line
@@ -90,9 +90,9 @@ static int amd64_insert_memory(struct agp_memory *mem, off_t pg_start, int type) 
		j++;

	}



	if (mem->is_flushed == FALSE) {

	if (!mem->is_flushed) {

		global_cache_flush();

		mem->is_flushed = TRUE;

		mem->is_flushed = true;

	}



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

drivers/char/agp/ati-agp.c

+2 −2
Original line number Diff line number Diff line
@@ -287,10 +287,10 @@ static int ati_insert_memory(struct agp_memory * mem, 
		j++;

	}



	if (mem->is_flushed == FALSE) {

	if (!mem->is_flushed) {

		/*CACHE_FLUSH(); */

		global_cache_flush();

		mem->is_flushed = TRUE;

		mem->is_flushed = true;

	}



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