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

Commit 464bdd33 authored by Antonino A. Daplas's avatar Antonino A. Daplas Committed by Linus Torvalds
Browse files

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: default avatarAntonino Daplas <adaplas@pol.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 66fd1412
Loading
Loading
Loading
Loading
+3 −1
Original line number Original line Diff line number Diff line
@@ -496,8 +496,10 @@ mode_set:
	cmpb	$VIDEO_FIRST_V7>>8, %ah
	cmpb	$VIDEO_FIRST_V7>>8, %ah
	jz	setv7
	jz	setv7
	
	
#ifdef CONFIG_FB
	cmpb	$VIDEO_FIRST_VESA>>8, %ah
	cmpb	$VIDEO_FIRST_VESA>>8, %ah
	jnc	check_vesa
	jnc	check_vesa
#endif


	orb	%ah, %ah
	orb	%ah, %ah
	jz	setmenu
	jz	setmenu