fbdev: ignore VESA modes if framebuffer is disabled

If the option vga=<VESA graphics mode> is added to the boot parameter, it will
activate graphics mode, but without any framebuffer support, the user is left
with an unusable display.

Change the behavior such that the user is instead prompted for another mode
(ala vga=ask).

NOTE: People can always use vbetool to set a graphics mode if this is really
desired, but the number of people doing this approaches zero.

Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Antonino A. Daplas 2007-05-08 00:37:29 -07:00 committed by Linus Torvalds
parent 66fd14120e
commit 464bdd33e9
1 changed files with 3 additions and 1 deletions

View File

@ -496,9 +496,11 @@ mode_set:
cmpb $VIDEO_FIRST_V7>>8, %ah
jz setv7
#ifdef CONFIG_FB
cmpb $VIDEO_FIRST_VESA>>8, %ah
jnc check_vesa
#endif
orb %ah, %ah
jz setmenu