vt: 32b glyph: 5. Amend three Kconfig files

Until it becomes clear how to integrate CONFIG_A11Y_BRAILLE_CONSOLE and
CONFIG_SPEAKUP, they will remain disabled when CONFIG_FB_GLYPH_21BIT is
#defined.

Signed-off-by: Alan Mackenzie <[email protected]>

diff --git a/drivers/accessibility/Kconfig b/drivers/accessibility/Kconfig
index 6b2f79d1f1b8..8f27e1c657b6 100644
--- a/drivers/accessibility/Kconfig
+++ b/drivers/accessibility/Kconfig
@@ -21,6 +21,7 @@ config A11Y_BRAILLE_CONSOLE
        bool "Console on braille device"
        depends on VT
        depends on SERIAL_CORE_CONSOLE
+       depends on !FB_GLYPH_21BIT
        help
          Enables console output on a braille device connected to a 8250
          serial port. For now only the VisioBraille device is supported.
diff --git a/drivers/accessibility/speakup/Kconfig 
b/drivers/accessibility/speakup/Kconfig
index e84fb617acc4..458bee03d3e8 100644
--- a/drivers/accessibility/speakup/Kconfig
+++ b/drivers/accessibility/speakup/Kconfig
@@ -3,6 +3,7 @@ menu "Speakup console speech"
 
 config SPEAKUP
        depends on VT
+       depends on !FB_GLYPH_21BIT
        tristate "Speakup core"
        help
                This is the Speakup screen reader.  Think of it as a
diff --git a/drivers/gpu/drm/clients/Kconfig b/drivers/gpu/drm/clients/Kconfig
index 6096c623d9d5..0ce8c1506eaa 100644
--- a/drivers/gpu/drm/clients/Kconfig
+++ b/drivers/gpu/drm/clients/Kconfig
@@ -42,6 +42,15 @@ config DRM_FBDEV_EMULATION
 
          If in doubt, say "Y".
 
+config FB_GLYPH_21BIT
+       bool "Enable 21-bit glyphs in the frame buffer device"
+       depends on (DRM_FBDEV_EMULATION = y)
+       help
+         This option enables 21-bit glyphs in the fbdev framebuffer,
+         surmounting the traditional restriction to 256/512 glyphs dating back
+         to the VGA hardware of the 1980s and 1990s.  To use this effectively
+         you will need a suitable font and possibly a suitable keyboard layout.
+
 config DRM_FBDEV_OVERALLOC
        int "Overallocation of the fbdev buffer"
        depends on DRM_FBDEV_EMULATION

Reply via email to