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

Commit f82af20e authored by Gerd Hoffmann's avatar Gerd Hoffmann Committed by Andi Kleen
Browse files

[PATCH] x86-64: ignore vgacon if hardware not present 



Avoid trying to set up vgacon if there's no vga hardware present.

Signed-off-by: default avatarJeremy Fitzhardinge <jeremy@xensource.com>
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Cc: Alan <alan@lxorguk.ukuu.org.uk>
Acked-by: default avatarIngo Molnar <mingo@elte.hu>
parent 889f21ce

drivers/video/console/vgacon.c

+2 −1
Original line number Diff line number Diff line
@@ -371,7 +371,8 @@ static const char *vgacon_startup(void) 
	}



	/* VGA16 modes are not handled by VGACON */

	if ((ORIG_VIDEO_MODE == 0x0D) ||	/* 320x200/4 */

	if ((ORIG_VIDEO_MODE == 0x00) ||	/* SCREEN_INFO not initialized */

	    (ORIG_VIDEO_MODE == 0x0D) ||	/* 320x200/4 */

	    (ORIG_VIDEO_MODE == 0x0E) ||	/* 640x200/4 */

	    (ORIG_VIDEO_MODE == 0x10) ||	/* 640x350/4 */

	    (ORIG_VIDEO_MODE == 0x12) ||	/* 640x480/4 */