Skip to content

Commit 995287d

Browse files
committed
sys-kernel/coreos-modules: Reenable console support for DRM
When the virtio graphic mode instead of qemu's bochs was used, the interactive console did not show up because fbdev emulation recently got disabled. Reenable fbdev emulation and also add the "simple" and BOCHS FB DRM driver to make TTM_HELPER and VRAM_HELPER available for the out-of-tree nvidia driver (which is needed when fbdev emulation is enabled). Fixes flatcar/Flatcar#1834 Signed-off-by: Kai Lueke <[email protected]>
1 parent a9221a4 commit 995287d

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Reenabled console support for DRM drivers, so that with the virtio graphics driver the interactive console is shown again after boot ([Flatcar#1834](https://github.com/flatcar/Flatcar/issues/1834))
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Enabled QEMU/BOCHS DRM support to get a larger console after boot, similar to how QEMU UEFI booting also gets a large console. The old behavior is still available with `./flatcar_production_qemu.sh -- -vga qxl`.

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.12

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,9 +169,13 @@ CONFIG_DM_VERITY=m
169169
CONFIG_DM_ZERO=m
170170
CONFIG_DNS_RESOLVER=y
171171
CONFIG_DRM=m
172+
CONFIG_DRM_BOCHS=m
173+
CONFIG_DRM_FBDEV_EMULATION=y
174+
CONFIG_DRM_SIMPLEDRM=m
175+
CONFIG_DRM_TTM_HELPER=m
172176
CONFIG_DRM_VIRTIO_GPU=m
177+
CONFIG_DRM_VRAM_HELPER=m
173178
CONFIG_DST_CACHE=y
174-
# CONFIG_DRM_FBDEV_EMULATION is not set
175179
CONFIG_DUMMY=m
176180
CONFIG_DYNAMIC_DEBUG=y
177181
CONFIG_E100=m

0 commit comments

Comments
 (0)