Skip to content

Commit a29d5b5

Browse files
authored
Merge pull request #3180 from flatcar/kai/drm-console
sys-kernel/coreos-modules: Reenable console support for DRM
2 parents f3b6a7d + 3f5a93a commit a29d5b5

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
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))

sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ EGIT_REPO_URI="https://github.com/flatcar/bootengine.git"
77
if [[ "${PV}" == 9999 ]]; then
88
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
99
else
10-
EGIT_COMMIT="1eb892c1970a158247b3709f81d03b44de7d806e" # flatcar-master
10+
EGIT_COMMIT="31ba2964ce5e77ae5553eb0a3624afcc7078bb09" # flatcar-master
1111
KEYWORDS="amd64 arm arm64 x86"
1212
fi
1313

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,9 +169,12 @@ CONFIG_DM_VERITY=m
169169
CONFIG_DM_ZERO=m
170170
CONFIG_DNS_RESOLVER=y
171171
CONFIG_DRM=m
172+
CONFIG_DRM_FBDEV_EMULATION=y
173+
CONFIG_DRM_QXL=m
174+
CONFIG_DRM_SIMPLEDRM=m
175+
CONFIG_DRM_TTM_HELPER=m
172176
CONFIG_DRM_VIRTIO_GPU=m
173177
CONFIG_DST_CACHE=y
174-
# CONFIG_DRM_FBDEV_EMULATION is not set
175178
CONFIG_DUMMY=m
176179
CONFIG_DYNAMIC_DEBUG=y
177180
CONFIG_E100=m

0 commit comments

Comments
 (0)