aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/char/agp/generic.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c
index eb052427670b..ac9da0ca36b7 100644
--- a/drivers/char/agp/generic.c
+++ b/drivers/char/agp/generic.c
@@ -355,7 +355,7 @@ int agp_bind_memory(struct agp_memory *curr, off_t pg_start)
355 return -EINVAL; 355 return -EINVAL;
356 356
357 if (curr->is_bound == TRUE) { 357 if (curr->is_bound == TRUE) {
358 printk (KERN_INFO PFX "memory %p is already bound!\n", curr); 358 printk(KERN_INFO PFX "memory %p is already bound!\n", curr);
359 return -EINVAL; 359 return -EINVAL;
360 } 360 }
361 if (curr->is_flushed == FALSE) { 361 if (curr->is_flushed == FALSE) {
@@ -390,7 +390,7 @@ int agp_unbind_memory(struct agp_memory *curr)
390 return -EINVAL; 390 return -EINVAL;
391 391
392 if (curr->is_bound != TRUE) { 392 if (curr->is_bound != TRUE) {
393 printk (KERN_INFO PFX "memory %p was not bound!\n", curr); 393 printk(KERN_INFO PFX "memory %p was not bound!\n", curr);
394 return -EINVAL; 394 return -EINVAL;
395 } 395 }
396 396
@@ -414,7 +414,7 @@ static void agp_v2_parse_one(u32 *requested_mode, u32 *bridge_agpstat, u32 *vga_
414 u32 tmp; 414 u32 tmp;
415 415
416 if (*requested_mode & AGP2_RESERVED_MASK) { 416 if (*requested_mode & AGP2_RESERVED_MASK) {
417 printk (KERN_INFO PFX "reserved bits set in mode 0x%x. Fixed.\n", *requested_mode); 417 printk(KERN_INFO PFX "reserved bits set in mode 0x%x. Fixed.\n", *requested_mode);
418 *requested_mode &= ~AGP2_RESERVED_MASK; 418 *requested_mode &= ~AGP2_RESERVED_MASK;
419 } 419 }
420 420
@@ -422,7 +422,7 @@ static void agp_v2_parse_one(u32 *requested_mode, u32 *bridge_agpstat, u32 *vga_
422 tmp = *requested_mode & 7; 422 tmp = *requested_mode & 7;
423 switch (tmp) { 423 switch (tmp) {
424 case 0: 424 case 0:
425 printk (KERN_INFO PFX "%s tried to set rate=x0. Setting to x1 mode.\n", current->comm); 425 printk(KERN_INFO PFX "%s tried to set rate=x0. Setting to x1 mode.\n", current->comm);
426 *requested_mode |= AGPSTAT2_1X; 426 *requested_mode |= AGPSTAT2_1X;
427 break; 427 break;
428 case 1: 428 case 1:
@@ -492,18 +492,18 @@ static void agp_v3_parse_one(u32 *requested_mode, u32 *bridge_agpstat, u32 *vga_
492 u32 tmp; 492 u32 tmp;
493 493
494 if (*requested_mode & AGP3_RESERVED_MASK) { 494 if (*requested_mode & AGP3_RESERVED_MASK) {
495 printk (KERN_INFO PFX "reserved bits set in mode 0x%x. Fixed.\n", *requested_mode); 495 printk(KERN_INFO PFX "reserved bits set in mode 0x%x. Fixed.\n", *requested_mode);
496 *requested_mode &= ~AGP3_RESERVED_MASK; 496 *requested_mode &= ~AGP3_RESERVED_MASK;
497 } 497 }
498 498
499 /* Check the speed bits make sense. */ 499 /* Check the speed bits make sense. */
500 tmp = *requested_mode & 7; 500 tmp = *requested_mode & 7;
501 if (tmp == 0) { 501 if (tmp == 0) {
502 printk (KERN_INFO PFX "%s tried to set rate=x0. Setting to AGP3 x4 mode.\n", current->comm); 502 printk(KERN_INFO PFX "%s tried to set rate=x0. Setting to AGP3 x4 mode.\n", current->comm);
503 *requested_mode |= AGPSTAT3_4X; 503 *requested_mode |= AGPSTAT3_4X;
504 } 504 }
505 if (tmp >= 3) { 505 if (tmp >= 3) {
506 printk (KERN_INFO PFX "%s tried to set rate=x%d. Setting to AGP3 x8 mode.\n", current->comm, tmp * 4); 506 printk(KERN_INFO PFX "%s tried to set rate=x%d. Setting to AGP3 x8 mode.\n", current->comm, tmp * 4);
507 *requested_mode = (*requested_mode & ~7) | AGPSTAT3_8X; 507 *requested_mode = (*requested_mode & ~7) | AGPSTAT3_8X;
508 } 508 }
509 509
@@ -532,7 +532,7 @@ static void agp_v3_parse_one(u32 *requested_mode, u32 *bridge_agpstat, u32 *vga_
532 * AGP2.x 4x -> AGP3.0 4x. 532 * AGP2.x 4x -> AGP3.0 4x.
533 */ 533 */
534 if (*requested_mode & AGPSTAT2_4X) { 534 if (*requested_mode & AGPSTAT2_4X) {
535 printk (KERN_INFO PFX "%s passes broken AGP3 flags (%x). Fixed.\n", 535 printk(KERN_INFO PFX "%s passes broken AGP3 flags (%x). Fixed.\n",
536 current->comm, *requested_mode); 536 current->comm, *requested_mode);
537 *requested_mode &= ~AGPSTAT2_4X; 537 *requested_mode &= ~AGPSTAT2_4X;
538 *requested_mode |= AGPSTAT3_4X; 538 *requested_mode |= AGPSTAT3_4X;
@@ -543,7 +543,7 @@ static void agp_v3_parse_one(u32 *requested_mode, u32 *bridge_agpstat, u32 *vga_
543 * but have been passed an AGP 2.x mode. 543 * but have been passed an AGP 2.x mode.
544 * Convert AGP 1x,2x,4x -> AGP 3.0 4x. 544 * Convert AGP 1x,2x,4x -> AGP 3.0 4x.
545 */ 545 */
546 printk (KERN_INFO PFX "%s passes broken AGP2 flags (%x) in AGP3 mode. Fixed.\n", 546 printk(KERN_INFO PFX "%s passes broken AGP2 flags (%x) in AGP3 mode. Fixed.\n",
547 current->comm, *requested_mode); 547 current->comm, *requested_mode);
548 *requested_mode &= ~(AGPSTAT2_4X | AGPSTAT2_2X | AGPSTAT2_1X); 548 *requested_mode &= ~(AGPSTAT2_4X | AGPSTAT2_2X | AGPSTAT2_1X);
549 *requested_mode |= AGPSTAT3_4X; 549 *requested_mode |= AGPSTAT3_4X;
@@ -553,13 +553,13 @@ static void agp_v3_parse_one(u32 *requested_mode, u32 *bridge_agpstat, u32 *vga_
553 if (!(*bridge_agpstat & AGPSTAT3_8X)) { 553 if (!(*bridge_agpstat & AGPSTAT3_8X)) {
554 *bridge_agpstat &= ~(AGPSTAT3_8X | AGPSTAT3_RSVD); 554 *bridge_agpstat &= ~(AGPSTAT3_8X | AGPSTAT3_RSVD);
555 *bridge_agpstat |= AGPSTAT3_4X; 555 *bridge_agpstat |= AGPSTAT3_4X;
556 printk ("%s requested AGPx8 but bridge not capable.\n", current->comm); 556 printk(KERN_INFO PFX "%s requested AGPx8 but bridge not capable.\n", current->comm);
557 return; 557 return;
558 } 558 }
559 if (!(*vga_agpstat & AGPSTAT3_8X)) { 559 if (!(*vga_agpstat & AGPSTAT3_8X)) {
560 *bridge_agpstat &= ~(AGPSTAT3_8X | AGPSTAT3_RSVD); 560 *bridge_agpstat &= ~(AGPSTAT3_8X | AGPSTAT3_RSVD);
561 *bridge_agpstat |= AGPSTAT3_4X; 561 *bridge_agpstat |= AGPSTAT3_4X;
562 printk ("%s requested AGPx8 but graphic card not capable.\n", current->comm); 562 printk(KERN_INFO PFX "%s requested AGPx8 but graphic card not capable.\n", current->comm);
563 return; 563 return;
564 } 564 }
565 /* All set, bridge & device can do AGP x8*/ 565 /* All set, bridge & device can do AGP x8*/
@@ -577,13 +577,13 @@ static void agp_v3_parse_one(u32 *requested_mode, u32 *bridge_agpstat, u32 *vga_
577 if ((*bridge_agpstat & AGPSTAT3_4X) && (*vga_agpstat & AGPSTAT3_4X)) 577 if ((*bridge_agpstat & AGPSTAT3_4X) && (*vga_agpstat & AGPSTAT3_4X))
578 *bridge_agpstat |= AGPSTAT3_4X; 578 *bridge_agpstat |= AGPSTAT3_4X;
579 else { 579 else {
580 printk (KERN_INFO PFX "Badness. Don't know which AGP mode to set. " 580 printk(KERN_INFO PFX "Badness. Don't know which AGP mode to set. "
581 "[bridge_agpstat:%x vga_agpstat:%x fell back to:- bridge_agpstat:%x vga_agpstat:%x]\n", 581 "[bridge_agpstat:%x vga_agpstat:%x fell back to:- bridge_agpstat:%x vga_agpstat:%x]\n",
582 origbridge, origvga, *bridge_agpstat, *vga_agpstat); 582 origbridge, origvga, *bridge_agpstat, *vga_agpstat);
583 if (!(*bridge_agpstat & AGPSTAT3_4X)) 583 if (!(*bridge_agpstat & AGPSTAT3_4X))
584 printk (KERN_INFO PFX "Bridge couldn't do AGP x4.\n"); 584 printk(KERN_INFO PFX "Bridge couldn't do AGP x4.\n");
585 if (!(*vga_agpstat & AGPSTAT3_4X)) 585 if (!(*vga_agpstat & AGPSTAT3_4X))
586 printk (KERN_INFO PFX "Graphic card couldn't do AGP x4.\n"); 586 printk(KERN_INFO PFX "Graphic card couldn't do AGP x4.\n");
587 return; 587 return;
588 } 588 }
589 } 589 }
@@ -621,7 +621,7 @@ u32 agp_collect_device_status(struct agp_bridge_data *bridge, u32 requested_mode
621 for (;;) { 621 for (;;) {
622 device = pci_get_class(PCI_CLASS_DISPLAY_VGA << 8, device); 622 device = pci_get_class(PCI_CLASS_DISPLAY_VGA << 8, device);
623 if (!device) { 623 if (!device) {
624 printk (KERN_INFO PFX "Couldn't find an AGP VGA controller.\n"); 624 printk(KERN_INFO PFX "Couldn't find an AGP VGA controller.\n");
625 return 0; 625 return 0;
626 } 626 }
627 cap_ptr = pci_find_capability(device, PCI_CAP_ID_AGP); 627 cap_ptr = pci_find_capability(device, PCI_CAP_ID_AGP);
@@ -733,7 +733,7 @@ void agp_generic_enable(struct agp_bridge_data *bridge, u32 requested_mode)
733 pci_write_config_dword(bridge->dev, 733 pci_write_config_dword(bridge->dev,
734 bridge->capndx+AGPCTRL, temp); 734 bridge->capndx+AGPCTRL, temp);
735 735
736 printk (KERN_INFO PFX "Device is in legacy mode," 736 printk(KERN_INFO PFX "Device is in legacy mode,"
737 " falling back to 2.x\n"); 737 " falling back to 2.x\n");
738 } 738 }
739 } 739 }