Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2cc1a413 authored by Dave Jones's avatar Dave Jones
Browse files

[AGPGART] printk fixups. 



Signed-off-by: default avatarDave Jones <davej@redhat.com>
parent 7357db12

drivers/char/agp/generic.c

+6 −3
Original line number Diff line number Diff line
@@ -581,18 +581,21 @@ static void agp_v3_parse_one(u32 *requested_mode, u32 *bridge_agpstat, u32 *vga_ 
		 * If not, we fall back to x4 mode.

		 */

		if ((*bridge_agpstat & AGPSTAT3_8X) && (*vga_agpstat & AGPSTAT3_8X)) {

			printk(KERN_INFO PFX "No AGP mode specified. Setting to highest mode supported by bridge & card (x8).\n");

			printk(KERN_INFO PFX "No AGP mode specified. Setting to highest mode "

				"supported by bridge & card (x8).\n");

			*bridge_agpstat &= ~(AGPSTAT3_4X | AGPSTAT3_RSVD);

			*vga_agpstat &= ~(AGPSTAT3_4X | AGPSTAT3_RSVD);

		} else {

			printk(KERN_INFO PFX "Fell back to AGPx4 mode because");

			if (!(*bridge_agpstat & AGPSTAT3_8X)) {

				printk("bridge couldn't do x8. bridge_agpstat:%x (orig=%x)\n", *bridge_agpstat, origbridge);

				printk(KERN_INFO PFX "bridge couldn't do x8. bridge_agpstat:%x (orig=%x)\n",

					*bridge_agpstat, origbridge);

				*bridge_agpstat &= ~(AGPSTAT3_8X | AGPSTAT3_RSVD);

				*bridge_agpstat |= AGPSTAT3_4X;

			}

			if (!(*vga_agpstat & AGPSTAT3_8X)) {

				printk("graphics card couldn't do x8. vga_agpstat:%x (orig=%x)\n", *vga_agpstat, origvga);

				printk(KERN_INFO PFX "graphics card couldn't do x8. vga_agpstat:%x (orig=%x)\n",

					*vga_agpstat, origvga);

				*vga_agpstat &= ~(AGPSTAT3_8X | AGPSTAT3_RSVD);

				*vga_agpstat |= AGPSTAT3_4X;

			}