Refine SCREEN_INFO sanity check for vgacon initialization

Refine SCREEN_INFO sanity check for vgacon initialization.

Checking video mode field only to see whenever SCREEN_INFO is
initialized is not enougth, in some cases it is zero although
a vga card is present.  Lets additionally check cols and lines.

Signed-off-by: Gerd Hoffmann <[email protected]>
Cc: Rusty Russell <[email protected]>
Cc: Andi Kleen <[email protected]>
Cc: Alan <[email protected]>
Cc: Ingo Molnar <[email protected]>
Acked-by: Eric W. Biederman <[email protected]>
Cc: "H. Peter Anvin" <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
Gerd Hoffmann 2007-05-16 22:11:09 -07:00 • committed by Linus Torvalds
commit a1a4849c41

View file

@ -368,9 +368,14 @@ static const char *vgacon_startup(void)
#endif
}
/* SCREEN_INFO initialized? */
if ((ORIG_VIDEO_MODE == 0) &&
(ORIG_VIDEO_LINES == 0) &&
(ORIG_VIDEO_COLS == 0))
goto no_vga;
/* VGA16 modes are not handled by VGACON */
if ((ORIG_VIDEO_MODE == 0x00) || /* SCREEN_INFO not initialized */
(ORIG_VIDEO_MODE == 0x0D) || /* 320x200/4 */
if ((ORIG_VIDEO_MODE == 0x0D) || /* 320x200/4 */
(ORIG_VIDEO_MODE == 0x0E) || /* 640x200/4 */
(ORIG_VIDEO_MODE == 0x10) || /* 640x350/4 */
(ORIG_VIDEO_MODE == 0x12) || /* 640x480/4 */