aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorMichal Januszewski <spock@gentoo.org>2008-10-16 01:03:51 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-16 14:21:45 -0400
commit4d31a2b74c6d063362ae10ce3be3e80d8713bf23 (patch)
treec125a2e581620a333437bcc5b3e75d24af928c58 /drivers/video
parent5ab4840968cd094586f65fce978e35c66d25ac78 (diff)
fbdev: ignore VESA modes if framebuffer does not support them
Currently, it is possible to set a graphics VESA mode at boot time via the vga= parameter even when no framebuffer driver supporting this is configured. This could lead to the system booting with a black screen, without a usable console. Fix this problem by only allowing to set graphics modes at boot time if a supporting framebuffer driver is configured. Signed-off-by: Michal Januszewski <spock@gentoo.org> Acked-by: Krzysztof Helt <krzysztof.h1@wp.pl> Cc: "H. Peter Anvin" <hpa@zytor.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/Kconfig11
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 3b296e410f91..6210755cf6ab 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -76,6 +76,14 @@ config FB_DDC
76 select I2C 76 select I2C
77 default n 77 default n
78 78
79config FB_BOOT_VESA_SUPPORT
80 bool
81 depends on FB
82 default n
83 ---help---
84 If true, at least one selected framebuffer driver can take advantage
85 of VESA video modes set at an early boot stage via the vga= parameter.
86
79config FB_CFB_FILLRECT 87config FB_CFB_FILLRECT
80 tristate 88 tristate
81 depends on FB 89 depends on FB
@@ -681,6 +689,7 @@ config FB_VESA
681 select FB_CFB_FILLRECT 689 select FB_CFB_FILLRECT
682 select FB_CFB_COPYAREA 690 select FB_CFB_COPYAREA
683 select FB_CFB_IMAGEBLIT 691 select FB_CFB_IMAGEBLIT
692 select FB_BOOT_VESA_SUPPORT
684 help 693 help
685 This is the frame buffer device driver for generic VESA 2.0 694 This is the frame buffer device driver for generic VESA 2.0
686 compliant graphic cards. The older VESA 1.2 cards are not supported. 695 compliant graphic cards. The older VESA 1.2 cards are not supported.
@@ -1117,6 +1126,7 @@ config FB_INTEL
1117 select FB_CFB_FILLRECT 1126 select FB_CFB_FILLRECT
1118 select FB_CFB_COPYAREA 1127 select FB_CFB_COPYAREA
1119 select FB_CFB_IMAGEBLIT 1128 select FB_CFB_IMAGEBLIT
1129 select FB_BOOT_VESA_SUPPORT
1120 help 1130 help
1121 This driver supports the on-board graphics built in to the Intel 1131 This driver supports the on-board graphics built in to the Intel
1122 830M/845G/852GM/855GM/865G/915G/915GM/945G/945GM/965G/965GM chipsets. 1132 830M/845G/852GM/855GM/865G/915G/915GM/945G/945GM/965G/965GM chipsets.
@@ -1469,6 +1479,7 @@ config FB_SIS
1469 select FB_CFB_FILLRECT 1479 select FB_CFB_FILLRECT
1470 select FB_CFB_COPYAREA 1480 select FB_CFB_COPYAREA
1471 select FB_CFB_IMAGEBLIT 1481 select FB_CFB_IMAGEBLIT
1482 select FB_BOOT_VESA_SUPPORT
1472 help 1483 help
1473 This is the frame buffer device driver for the SiS 300, 315, 330 1484 This is the frame buffer device driver for the SiS 300, 315, 330
1474 and 340 series as well as XGI V3XT, V5, V8, Z7 graphics chipsets. 1485 and 340 series as well as XGI V3XT, V5, V8, Z7 graphics chipsets.