Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
[AGPGART] printk fixups.
Signed-off-by: Dave Jones <davej@redhat.com>
+6
-3
drivers/char/agp/generic.c
+6
-3
drivers/char/agp/generic.c
···
581
* If not, we fall back to x4 mode.
582
*/
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");
585
*bridge_agpstat &= ~(AGPSTAT3_4X | AGPSTAT3_RSVD);
586
*vga_agpstat &= ~(AGPSTAT3_4X | AGPSTAT3_RSVD);
587
} else {
588
printk(KERN_INFO PFX "Fell back to AGPx4 mode because");
589
if (!(*bridge_agpstat & AGPSTAT3_8X)) {
590
-
printk("bridge couldn't do x8. bridge_agpstat:%x (orig=%x)\n", *bridge_agpstat, origbridge);
591
*bridge_agpstat &= ~(AGPSTAT3_8X | AGPSTAT3_RSVD);
592
*bridge_agpstat |= AGPSTAT3_4X;
593
}
594
if (!(*vga_agpstat & AGPSTAT3_8X)) {
595
-
printk("graphics card couldn't do x8. vga_agpstat:%x (orig=%x)\n", *vga_agpstat, origvga);
596
*vga_agpstat &= ~(AGPSTAT3_8X | AGPSTAT3_RSVD);
597
*vga_agpstat |= AGPSTAT3_4X;
598
}
···
581
* If not, we fall back to x4 mode.
582
*/
583
if ((*bridge_agpstat & AGPSTAT3_8X) && (*vga_agpstat & AGPSTAT3_8X)) {
584
+
printk(KERN_INFO PFX "No AGP mode specified. Setting to highest mode "
585
+
"supported by bridge & card (x8).\n");
586
*bridge_agpstat &= ~(AGPSTAT3_4X | AGPSTAT3_RSVD);
587
*vga_agpstat &= ~(AGPSTAT3_4X | AGPSTAT3_RSVD);
588
} else {
589
printk(KERN_INFO PFX "Fell back to AGPx4 mode because");
590
if (!(*bridge_agpstat & AGPSTAT3_8X)) {
591
+
printk(KERN_INFO PFX "bridge couldn't do x8. bridge_agpstat:%x (orig=%x)\n",
592
+
*bridge_agpstat, origbridge);
593
*bridge_agpstat &= ~(AGPSTAT3_8X | AGPSTAT3_RSVD);
594
*bridge_agpstat |= AGPSTAT3_4X;
595
}
596
if (!(*vga_agpstat & AGPSTAT3_8X)) {
597
+
printk(KERN_INFO PFX "graphics card couldn't do x8. vga_agpstat:%x (orig=%x)\n",
598
+
*vga_agpstat, origvga);
599
*vga_agpstat &= ~(AGPSTAT3_8X | AGPSTAT3_RSVD);
600
*vga_agpstat |= AGPSTAT3_4X;
601
}