aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEd Maste <emaste@FreeBSD.org>2021-11-27 20:27:45 +0000
committerEd Maste <emaste@FreeBSD.org>2021-11-28 16:29:17 +0000
commitb8cf1c5c30a5e6da4e2c9702ffd607a90453fb33 (patch)
tree51cd0f234fb25023eef8e3f8de277b479e05039a
parent4f924a786ae08af496dfe55230f8fe1e2ca16150 (diff)
downloadsrc-b8cf1c5c30a5.tar.gz
src-b8cf1c5c30a5.zip
Remove options VESA from x86 GENERIC
options VESA / vesa.ko provides VESA Bios Extensions (VBE) support for the legacy sc(4) console. It is not used by the default console, vt(4). There is a report[1] of an incompatibility between VESA and the Nvidia driver breaking suspend/resume. Since VESA is not used by the default configuration anyway, just remove options VESA from GENERIC. The kernel module is still available and may be loaded by sc(4) users who want to select a VBE mode. (Note that vt(4) does not support selecting a VBE mode. The loader can set a VBE mode and vt(4) will use it via the vt_vbefb driver.) [1] https://lists.freebsd.org/archives/freebsd-hackers/2021-November/000469.html PR: 253733 Reported by: Stefan Blachmann [1] Reviewed by: imp, manu, tsoome Relnotes: Yes Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D33141
-rw-r--r--sys/amd64/conf/GENERIC1
-rw-r--r--sys/i386/conf/GENERIC1
2 files changed, 0 insertions, 2 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 2732569c461c..edd7ae6419d2 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -213,7 +213,6 @@ device psm # PS/2 mouse
device kbdmux # keyboard multiplexer
device vga # VGA video card driver
-options VESA # Add support for VESA BIOS Extensions (VBE)
device splash # Splash screen and screen saver support
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index e3f1aee8c723..26bdf4a53ed0 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -182,7 +182,6 @@ device psm # PS/2 mouse
device kbdmux # keyboard multiplexer
device vga # VGA video card driver
-options VESA # Add support for VESA BIOS Extensions (VBE)
device splash # Splash screen and screen saver support