From 27c212a2bbd8dcfd8e0c2d2bb30198bc79ba1968 Mon Sep 17 00:00:00 2001 From: Kai Lueke Date: Mon, 11 Aug 2025 16:27:29 +0200 Subject: [PATCH 1/2] 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 QXL FB DRM driver to make TTM_HELPER available for the out-of-tree nvidia driver (which is needed when fbdev emulation is enabled). Fixes https://github.com/flatcar/Flatcar/issues/1834 Signed-off-by: Kai Lueke --- changelog/bugfixes/2025-08-11-drm-console.md | 1 + .../sys-kernel/coreos-modules/files/commonconfig-6.12 | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 changelog/bugfixes/2025-08-11-drm-console.md diff --git a/changelog/bugfixes/2025-08-11-drm-console.md b/changelog/bugfixes/2025-08-11-drm-console.md new file mode 100644 index 00000000000..718c5c36167 --- /dev/null +++ b/changelog/bugfixes/2025-08-11-drm-console.md @@ -0,0 +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)) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.12 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.12 index 32312c1cba9..1e19ff41f1f 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.12 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.12 @@ -169,9 +169,12 @@ CONFIG_DM_VERITY=m CONFIG_DM_ZERO=m CONFIG_DNS_RESOLVER=y CONFIG_DRM=m +CONFIG_DRM_FBDEV_EMULATION=y +CONFIG_DRM_QXL=m +CONFIG_DRM_SIMPLEDRM=m +CONFIG_DRM_TTM_HELPER=m CONFIG_DRM_VIRTIO_GPU=m CONFIG_DST_CACHE=y -# CONFIG_DRM_FBDEV_EMULATION is not set CONFIG_DUMMY=m CONFIG_DYNAMIC_DEBUG=y CONFIG_E100=m From 3f5a93a31159f75d3413ef7e2207ea19528c3236 Mon Sep 17 00:00:00 2001 From: Kai Lueke Date: Tue, 12 Aug 2025 13:46:01 +0200 Subject: [PATCH 2/2] sys-kernel/bootengine: Reduce size with wrapper scripts This pulls in https://github.com/flatcar/bootengine/pull/108 Signed-off-by: Kai Lueke --- .../coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild index 3fdd628d7de..341d7f0909a 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild @@ -7,7 +7,7 @@ EGIT_REPO_URI="https://github.com/flatcar/bootengine.git" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" else - EGIT_COMMIT="1eb892c1970a158247b3709f81d03b44de7d806e" # flatcar-master + EGIT_COMMIT="31ba2964ce5e77ae5553eb0a3624afcc7078bb09" # flatcar-master KEYWORDS="amd64 arm arm64 x86" fi