lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Linus Torvalds
2005-09-08 17:22:53 -07:00
parent 5420520973 29db35edb2
commit e3e3679cfc
2 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/char/agp/generic.c
View File

@@ -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; info->mode = bridge->mode & ~AGP3_RESERVED_MASK;
else else
info->mode = bridge->mode & ~AGP2_RESERVED_MASK; info->mode = bridge->mode & ~AGP2_RESERVED_MASK;
info->mode = bridge->mode;
info->aper_base = bridge->gart_bus_addr; info->aper_base = bridge->gart_bus_addr;
info->aper_size = agp_return_size(); info->aper_size = agp_return_size();
info->max_memory = bridge->max_memory_agp; 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)) { if (!(*bridge_agpstat & AGPSTAT3_8X)) {
*bridge_agpstat &= ~(AGPSTAT3_8X | AGPSTAT3_RSVD); *bridge_agpstat &= ~(AGPSTAT3_8X | AGPSTAT3_RSVD);
*bridge_agpstat |= AGPSTAT3_4X; *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; return;
} }
if (!(*vga_agpstat & AGPSTAT3_8X)) { if (!(*vga_agpstat & AGPSTAT3_8X)) {
*bridge_agpstat &= ~(AGPSTAT3_8X | AGPSTAT3_RSVD); *bridge_agpstat &= ~(AGPSTAT3_8X | AGPSTAT3_RSVD);
*bridge_agpstat |= AGPSTAT3_4X; *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; return;
} }
/* All set, bridge & device can do AGP x8*/ /* All set, bridge & device can do AGP x8*/