From 765374ed2dd68f6edb9fabbe0af2e3385614504e Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Wed, 16 May 2007 22:11:09 -0700 Subject: [PATCH] --- yaml --- r: 56524 b: refs/heads/master c: a1a4849c419337f649c6633219b555eb4d4d955a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/console/vgacon.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d79b4d57e5a2..4ebbcd72c4dc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 79974a0e4c6be6e9a3717b4c5a5d5c44c36b1653 +refs/heads/master: a1a4849c419337f649c6633219b555eb4d4d955a diff --git a/trunk/drivers/video/console/vgacon.c b/trunk/drivers/video/console/vgacon.c index 2460b82a1d93..f46fe95f69fb 100644 --- a/trunk/drivers/video/console/vgacon.c +++ b/trunk/drivers/video/console/vgacon.c @@ -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 */