Skip to content

Commit

Permalink
[PATCH] x86-64: ignore vgacon if hardware not present
Browse files Browse the repository at this point in the history
Avoid trying to set up vgacon if there's no vga hardware present.

Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Andi Kleen <ak@suse.de>
Cc: Alan <alan@lxorguk.ukuu.org.uk>
Acked-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Gerd Hoffmann authored and Andi Kleen committed May 2, 2007
1 parent 889f21c commit f82af20
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/video/console/vgacon.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit f82af20

Please sign in to comment.