The patch titled
fbdev: ignore VESA modes if framebuffer is disabled
has been added to the -mm tree. Its filename is
fbdev-ignore-vesa-modes-if-framebuffer-is-disabled.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: fbdev: ignore VESA modes if framebuffer is disabled
From: "Antonino A. Daplas" <adaplas@xxxxxxxxx>
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@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/i386/boot/video.S | 4 +++-
arch/x86_64/boot/video.S | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff -puN arch/i386/boot/video.S~fbdev-ignore-vesa-modes-if-framebuffer-is-disabled arch/i386/boot/video.S
--- a/arch/i386/boot/video.S~fbdev-ignore-vesa-modes-if-framebuffer-is-disabled
+++ a/arch/i386/boot/video.S
@@ -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
diff -puN arch/x86_64/boot/video.S~fbdev-ignore-vesa-modes-if-framebuffer-is-disabled arch/x86_64/boot/video.S
--- a/arch/x86_64/boot/video.S~fbdev-ignore-vesa-modes-if-framebuffer-is-disabled
+++ a/arch/x86_64/boot/video.S
@@ -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
_
Patches currently in -mm which might be from adaplas@xxxxxxxxx are
patch-maintainers-update-email-address.patch
atyfb-fix-kconfig-error.patch
fbdev-add-ultrasharp-uxga-to-broken-monitor-database.patch
intelfb-fix-ring-space-calculation.patch
nvidiafb-bring-back-generic-ddc-reading.patch
fbdev-ignore-vesa-modes-if-framebuffer-is-disabled.patch
fbdev-fix-obvious-bug-in-show_pan.patch
neofb-fill-transp-msb_right-with-the-correct.patch
atyfb-kill-dead-code.patch
fbdev-mm-deferred-io-support.patch
fbdev-hecuba-framebuffer-driver.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
