bk://linux-dj.bkbits.net/agpgart davej@redhat.com|ChangeSet|20050324221448|36492 davej # This is a BitKeeper generated diff -Nru style patch. # # ChangeSet # 2005/03/30 12:06:34-08:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-agpgart # # drivers/char/agp/via-agp.c # 2005/03/30 12:06:28-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2005/03/28 22:18:41-08:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-agpgart # # drivers/char/agp/generic.c # 2005/03/28 22:18:32-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2005/03/27 16:20:09-08:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-agpgart # # drivers/char/agp/via-agp.c # 2005/03/27 16:19:59-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2005/03/24 17:14:48-05:00 davej@redhat.com # [AGPGART] Fix up tlb flushing on VIA. # # A previous commit broke this horribly. # # Signed-off-by: Dave Jones # # drivers/char/agp/via-agp.c # 2005/03/24 17:14:40-05:00 davej@redhat.com +0 -2 # [AGPGART] Fix up tlb flushing on VIA. # # A previous commit broke this horribly. # # Signed-off-by: Dave Jones # # ChangeSet # 2005/03/23 13:20:00-08:00 akpm@bix.(none) # Merge bk://linux-dj.bkbits.net/agpgart # into bix.(none):/usr/src/bk-agpgart # # drivers/char/agp/generic.c # 2005/03/23 13:19:55-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2005/03/22 17:11:55-05:00 davej@redhat.com # [AGPGART] Fix up printk's in generic code. # # Missing printk levels, and whitespace glitches. # # Signed-off-by: Christophe Lucas # Signed-off-by: Dave Jones # # drivers/char/agp/generic.c # 2005/03/22 17:11:47-05:00 davej@redhat.com +16 -16 # [AGPGART] Fix up printk's in generic code. # # Missing printk levels, and whitespace glitches. # # Signed-off-by: Christophe Lucas # Signed-off-by: Dave Jones # # ChangeSet # 2005/03/10 19:01:57-08:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-agpgart # # drivers/char/agp/generic.c # 2005/03/10 19:01:53-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2005/03/10 18:27:59-08:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-agpgart # # drivers/char/agp/generic.c # 2005/03/10 18:27:55-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2005/03/10 17:43:09-08:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-agpgart # # drivers/char/agp/generic.c # 2005/03/10 17:43:03-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2005/03/06 19:26:18-08:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-agpgart # # include/linux/agp_backend.h # 2005/03/06 19:26:14-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/char/agp/sis-agp.c # 2005/03/06 19:26:14-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/char/agp/generic.c # 2005/03/06 19:26:13-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2005/03/04 22:04:41-08:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-agpgart # # drivers/char/agp/sis-agp.c # 2005/03/04 22:04:34-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/char/agp/generic.c # 2005/03/04 22:04:34-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2005/03/02 13:57:43-08:00 akpm@bix.(none) # Merge bk://linux-dj.bkbits.net/agpgart # into bix.(none):/usr/src/bk-agpgart # # include/linux/agp_backend.h # 2005/03/02 13:57:38-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2005/03/01 16:41:16-08:00 akpm@bix.(none) # Merge bk://linux-dj.bkbits.net/agpgart # into bix.(none):/usr/src/bk-agpgart # # include/linux/agp_backend.h # 2005/03/01 16:41:11-08:00 akpm@bix.(none) +0 -1 # Auto merged # diff -Nru a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c --- a/drivers/char/agp/generic.c 2005-04-10 17:05:41 -07:00 +++ b/drivers/char/agp/generic.c 2005-04-10 17:05:41 -07:00 @@ -369,7 +369,7 @@ return -EINVAL; if (curr->is_bound == TRUE) { - printk (KERN_INFO PFX "memory %p is already bound!\n", curr); + printk(KERN_INFO PFX "memory %p is already bound!\n", curr); return -EINVAL; } if (curr->is_flushed == FALSE) { @@ -404,7 +404,7 @@ return -EINVAL; if (curr->is_bound != TRUE) { - printk (KERN_INFO PFX "memory %p was not bound!\n", curr); + printk(KERN_INFO PFX "memory %p was not bound!\n", curr); return -EINVAL; } @@ -428,7 +428,7 @@ u32 tmp; if (*requested_mode & AGP2_RESERVED_MASK) { - printk (KERN_INFO PFX "reserved bits set in mode 0x%x. Fixed.\n", *requested_mode); + printk(KERN_INFO PFX "reserved bits set in mode 0x%x. Fixed.\n", *requested_mode); *requested_mode &= ~AGP2_RESERVED_MASK; } @@ -436,7 +436,7 @@ tmp = *requested_mode & 7; switch (tmp) { case 0: - printk (KERN_INFO PFX "%s tried to set rate=x0. Setting to x1 mode.\n", current->comm); + printk(KERN_INFO PFX "%s tried to set rate=x0. Setting to x1 mode.\n", current->comm); *requested_mode |= AGPSTAT2_1X; break; case 1: @@ -506,18 +506,18 @@ u32 tmp; if (*requested_mode & AGP3_RESERVED_MASK) { - printk (KERN_INFO PFX "reserved bits set in mode 0x%x. Fixed.\n", *requested_mode); + printk(KERN_INFO PFX "reserved bits set in mode 0x%x. Fixed.\n", *requested_mode); *requested_mode &= ~AGP3_RESERVED_MASK; } /* Check the speed bits make sense. */ tmp = *requested_mode & 7; if (tmp == 0) { - printk (KERN_INFO PFX "%s tried to set rate=x0. Setting to AGP3 x4 mode.\n", current->comm); + printk(KERN_INFO PFX "%s tried to set rate=x0. Setting to AGP3 x4 mode.\n", current->comm); *requested_mode |= AGPSTAT3_4X; } if (tmp >= 3) { - printk (KERN_INFO PFX "%s tried to set rate=x%d. Setting to AGP3 x8 mode.\n", current->comm, tmp * 4); + printk(KERN_INFO PFX "%s tried to set rate=x%d. Setting to AGP3 x8 mode.\n", current->comm, tmp * 4); *requested_mode = (*requested_mode & ~7) | AGPSTAT3_8X; } @@ -546,7 +546,7 @@ * AGP2.x 4x -> AGP3.0 4x. */ if (*requested_mode & AGPSTAT2_4X) { - printk (KERN_INFO PFX "%s passes broken AGP3 flags (%x). Fixed.\n", + printk(KERN_INFO PFX "%s passes broken AGP3 flags (%x). Fixed.\n", current->comm, *requested_mode); *requested_mode &= ~AGPSTAT2_4X; *requested_mode |= AGPSTAT3_4X; @@ -557,7 +557,7 @@ * but have been passed an AGP 2.x mode. * Convert AGP 1x,2x,4x -> AGP 3.0 4x. */ - printk (KERN_INFO PFX "%s passes broken AGP2 flags (%x) in AGP3 mode. Fixed.\n", + printk(KERN_INFO PFX "%s passes broken AGP2 flags (%x) in AGP3 mode. Fixed.\n", current->comm, *requested_mode); *requested_mode &= ~(AGPSTAT2_4X | AGPSTAT2_2X | AGPSTAT2_1X); *requested_mode |= AGPSTAT3_4X; @@ -567,13 +567,13 @@ 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*/ @@ -591,13 +591,13 @@ if ((*bridge_agpstat & AGPSTAT3_4X) && (*vga_agpstat & AGPSTAT3_4X)) *bridge_agpstat |= AGPSTAT3_4X; else { - printk (KERN_INFO PFX "Badness. Don't know which AGP mode to set. " + printk(KERN_INFO PFX "Badness. Don't know which AGP mode to set. " "[bridge_agpstat:%x vga_agpstat:%x fell back to:- bridge_agpstat:%x vga_agpstat:%x]\n", origbridge, origvga, *bridge_agpstat, *vga_agpstat); if (!(*bridge_agpstat & AGPSTAT3_4X)) - printk (KERN_INFO PFX "Bridge couldn't do AGP x4.\n"); + printk(KERN_INFO PFX "Bridge couldn't do AGP x4.\n"); if (!(*vga_agpstat & AGPSTAT3_4X)) - printk (KERN_INFO PFX "Graphic card couldn't do AGP x4.\n"); + printk(KERN_INFO PFX "Graphic card couldn't do AGP x4.\n"); return; } } @@ -635,7 +635,7 @@ for (;;) { device = pci_get_class(PCI_CLASS_DISPLAY_VGA << 8, device); if (!device) { - printk (KERN_INFO PFX "Couldn't find an AGP VGA controller.\n"); + printk(KERN_INFO PFX "Couldn't find an AGP VGA controller.\n"); return 0; } cap_ptr = pci_find_capability(device, PCI_CAP_ID_AGP); @@ -747,7 +747,7 @@ pci_write_config_dword(bridge->dev, bridge->capndx+AGPCTRL, temp); - printk (KERN_INFO PFX "Device is in legacy mode," + printk(KERN_INFO PFX "Device is in legacy mode," " falling back to 2.x\n"); } }