diff options
author | Dave Jones <davej@redhat.com> | 2006-09-28 19:50:07 -0400 |
---|---|---|
committer | Dave Jones <davej@redhat.com> | 2006-09-28 19:50:07 -0400 |
commit | 2cc1a4134f51b4aff7c7486d857e6773f493e370 (patch) | |
tree | 07eabddc1448ae3a321224827a9c5448e345e281 | |
parent | 7357db1209f27210f97b2a9dd22177f1886a1198 (diff) |
[AGPGART] printk fixups.
Signed-off-by: Dave Jones <davej@redhat.com>
-rw-r--r-- | drivers/char/agp/generic.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c index 0dcdb363923f..c39200161688 100644 --- a/drivers/char/agp/generic.c +++ b/drivers/char/agp/generic.c | |||
@@ -581,18 +581,21 @@ static void agp_v3_parse_one(u32 *requested_mode, u32 *bridge_agpstat, u32 *vga_ | |||
581 | * If not, we fall back to x4 mode. | 581 | * If not, we fall back to x4 mode. |
582 | */ | 582 | */ |
583 | if ((*bridge_agpstat & AGPSTAT3_8X) && (*vga_agpstat & AGPSTAT3_8X)) { | 583 | if ((*bridge_agpstat & AGPSTAT3_8X) && (*vga_agpstat & AGPSTAT3_8X)) { |
584 | printk(KERN_INFO PFX "No AGP mode specified. Setting to highest mode supported by bridge & card (x8).\n"); | 584 | printk(KERN_INFO PFX "No AGP mode specified. Setting to highest mode " |
585 | "supported by bridge & card (x8).\n"); | ||
585 | *bridge_agpstat &= ~(AGPSTAT3_4X | AGPSTAT3_RSVD); | 586 | *bridge_agpstat &= ~(AGPSTAT3_4X | AGPSTAT3_RSVD); |
586 | *vga_agpstat &= ~(AGPSTAT3_4X | AGPSTAT3_RSVD); | 587 | *vga_agpstat &= ~(AGPSTAT3_4X | AGPSTAT3_RSVD); |
587 | } else { | 588 | } else { |
588 | printk(KERN_INFO PFX "Fell back to AGPx4 mode because"); | 589 | printk(KERN_INFO PFX "Fell back to AGPx4 mode because"); |
589 | if (!(*bridge_agpstat & AGPSTAT3_8X)) { | 590 | if (!(*bridge_agpstat & AGPSTAT3_8X)) { |
590 | printk("bridge couldn't do x8. bridge_agpstat:%x (orig=%x)\n", *bridge_agpstat, origbridge); | 591 | printk(KERN_INFO PFX "bridge couldn't do x8. bridge_agpstat:%x (orig=%x)\n", |
592 | *bridge_agpstat, origbridge); | ||
591 | *bridge_agpstat &= ~(AGPSTAT3_8X | AGPSTAT3_RSVD); | 593 | *bridge_agpstat &= ~(AGPSTAT3_8X | AGPSTAT3_RSVD); |
592 | *bridge_agpstat |= AGPSTAT3_4X; | 594 | *bridge_agpstat |= AGPSTAT3_4X; |
593 | } | 595 | } |
594 | if (!(*vga_agpstat & AGPSTAT3_8X)) { | 596 | if (!(*vga_agpstat & AGPSTAT3_8X)) { |
595 | printk("graphics card couldn't do x8. vga_agpstat:%x (orig=%x)\n", *vga_agpstat, origvga); | 597 | printk(KERN_INFO PFX "graphics card couldn't do x8. vga_agpstat:%x (orig=%x)\n", |
598 | *vga_agpstat, origvga); | ||
596 | *vga_agpstat &= ~(AGPSTAT3_8X | AGPSTAT3_RSVD); | 599 | *vga_agpstat &= ~(AGPSTAT3_8X | AGPSTAT3_RSVD); |
597 | *vga_agpstat |= AGPSTAT3_4X; | 600 | *vga_agpstat |= AGPSTAT3_4X; |
598 | } | 601 | } |