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

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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>

authored by

Gerd Hoffmann and committed by

Andi Kleen 19 years ago f82af20e 889f21ce

+2 -1

1 changed file

expand all

drivers

video

console

vgacon.c

+2 -1

drivers/video/console/vgacon.c

··· 371 371 } 372 372 373 373 /* VGA16 modes are not handled by VGACON */ 374 - if ((ORIG_VIDEO_MODE == 0x0D) || /* 320x200/4 */ 374 + if ((ORIG_VIDEO_MODE == 0x00) || /* SCREEN_INFO not initialized */ 375 + (ORIG_VIDEO_MODE == 0x0D) || /* 320x200/4 */ 375 376 (ORIG_VIDEO_MODE == 0x0E) || /* 640x200/4 */ 376 377 (ORIG_VIDEO_MODE == 0x10) || /* 640x350/4 */ 377 378 (ORIG_VIDEO_MODE == 0x12) || /* 640x480/4 */