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

Commit a1a4849c authored by Gerd Hoffmann's avatar Gerd Hoffmann Committed by Linus Torvalds
Browse files

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: default avatarGerd Hoffmann <kraxel@redhat.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Andi Kleen <ak@suse.de>
Cc: Alan <alan@lxorguk.ukuu.org.uk>
Cc: Ingo Molnar <mingo@elte.hu>
Acked-by: default avatarEric W. Biederman <ebiederm@xmission.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 79974a0e

drivers/video/console/vgacon.c

+7 −2
Original line number Diff line number Diff line
@@ -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 */