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

drivers/char/agp/generic.c

+16 −17

Original line number	Diff line number	Diff line
		@@ -319,7 +319,6 @@ int agp_copy_info(struct agp_bridge_data bridge, struct agp_kern_info info)
		info->mode = bridge->mode & ~AGP3_RESERVED_MASK;
		else
		info->mode = bridge->mode & ~AGP2_RESERVED_MASK;
		info->mode = bridge->mode;
		info->aper_base = bridge->gart_bus_addr;
		info->aper_size = agp_return_size();
		info->max_memory = bridge->max_memory_agp;
		@@ -554,13 +553,13 @@ static void agp_v3_parse_one(u32 requested_mode, u32 bridge_agpstat, u32 *vga_
		if (!(*bridge_agpstat & AGPSTAT3_8X)) {
		*bridge_agpstat &= ~(AGPSTAT3_8X \| AGPSTAT3_RSVD);
		*bridge_agpstat \|= AGPSTAT3_4X;
		printk ("%s requested AGPx8 but bridge not capable.\n", current->comm);
		printk(KERN_INFO PFX "%s requested AGPx8 but bridge not capable.\n", current->comm);
		return;
		}
		if (!(*vga_agpstat & AGPSTAT3_8X)) {
		*bridge_agpstat &= ~(AGPSTAT3_8X \| AGPSTAT3_RSVD);
		*bridge_agpstat \|= AGPSTAT3_4X;
		printk ("%s requested AGPx8 but graphic card not capable.\n", current->comm);
		printk(KERN_INFO PFX "%s requested AGPx8 but graphic card not capable.\n", current->comm);
		return;
		}
		/* All set, bridge & device can do AGP x8*/

+1 −1

File changed.

Contains only whitespace changes.