diff --git a/meta-oe/recipes-graphics/kmscon/kmscon/0001-uterm-treat-platform-display-controllers-as-primary-GPUs.patch b/meta-oe/recipes-graphics/kmscon/kmscon/0001-uterm-treat-platform-display-controllers-as-primary-GPUs.patch deleted file mode 100644 index 88a071f542..0000000000 --- a/meta-oe/recipes-graphics/kmscon/kmscon/0001-uterm-treat-platform-display-controllers-as-primary-GPUs.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 92b87c18f67ba9c01b23b50d014c5c5cfa72717e Mon Sep 17 00:00:00 2001 -From: Markus Volk -Date: Wed, 7 Oct 2026 13:09:58 +0200 -Subject: [PATCH] uterm: treat platform display controllers as primary GPUs - -A GPU only counted as primary when its PCI parent had boot_vga set. -SoC display controllers such as vc4 on the Raspberry Pi are platform -devices without a PCI parent, so with gpus=primary kmscon ignored the -only display in the system and never showed a terminal. - -Treat DRM devices on the platform bus as primary. USB displays are -excluded: on these systems the USB controller is a platform device too, -so they would otherwise be taken as primary. - -Tested on a Raspberry Pi 4 with --gpus=primary: before, card0 (vc4) -was ignored as "no primary GPU"; now the terminal comes up on HDMI-A -with the drm2d backend. The USB exclusion is not tested on hardware. - -Assisted-By: Claude Opus 5.5 -Signed-off-by: Markus Volk - -Upstream-Status: Backport [https://github.com/kmscon/kmscon/pull/551/changes/e8d5af950b1046f060604932440306dd16c9039e] ---- - src/uterm/monitor.c | 14 +++++++++++++- - 1 file changed, 13 insertions(+), 1 deletion(-) - -diff --git a/src/uterm/monitor.c b/src/uterm/monitor.c -index f2141969..ccb5e422 100644 ---- a/src/uterm/monitor.c -+++ b/src/uterm/monitor.c -@@ -244,9 +244,21 @@ static bool is_drm_primary(struct uterm_monitor *mon, struct udev_device *dev, c - log_debug("DRM device %s is primary PCI GPU", node); - return true; - } -+ return false; - } - -- return false; -+ /* -+ * SoC display controllers are platform devices without a boot_vga -+ * attribute. Treat them as primary. USB displays sit below a platform -+ * USB controller on such systems, but are never primary. -+ */ -+ if (udev_device_get_parent_with_subsystem_devtype(dev, "usb", NULL)) -+ return false; -+ if (!udev_device_get_parent_with_subsystem_devtype(dev, "platform", NULL)) -+ return false; -+ -+ log_debug("DRM device %s is primary platform GPU", node); -+ return true; - } - - /* diff --git a/meta-oe/recipes-graphics/kmscon/kmscon/0002-vt_libseat-Fix-build-error-due-to-logging-changes.patch b/meta-oe/recipes-graphics/kmscon/kmscon/0002-vt_libseat-Fix-build-error-due-to-logging-changes.patch deleted file mode 100644 index 63db2e5297..0000000000 --- a/meta-oe/recipes-graphics/kmscon/kmscon/0002-vt_libseat-Fix-build-error-due-to-logging-changes.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 153db63d679df719a99dd36505f9c2f55d9c59f6 Mon Sep 17 00:00:00 2001 -From: Jocelyn Falempe -Date: Mon, 28 Sep 2026 11:46:21 +0200 -Subject: [PATCH] vt_libseat: Fix build error due to logging changes - -Commit "efda2b5 log: Simplify logging, remove timestamp, and level for notice and info." -changed the log_submit() arguments, and this was not updated in -vt_libseat.c - -Upstream-Status: Backport [https://github.com/kmscon/kmscon/commit/153db63d679df719a99dd36505f9c2f55d9c59f6] - -Signed-off-by: Jocelyn Falempe ---- - src/uterm/vt_libseat.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/uterm/vt_libseat.c b/src/uterm/vt_libseat.c -index 4f65c84..2097628 100644 ---- a/src/uterm/vt_libseat.c -+++ b/src/uterm/vt_libseat.c -@@ -260,7 +260,7 @@ static enum log_severity log_level(enum libseat_log_level level) - - static void log_libseat(enum libseat_log_level level, const char *fmt, va_list args) - { -- log_submit(LOG_DEFAULT, log_level(level), fmt, args); -+ log_submit(log_level(level), "libseat", fmt, args); - } - - static void vt_libseat_input(struct input *input, struct input_key_event *ev, void *data) --- -2.55.0 - diff --git a/meta-oe/recipes-graphics/kmscon/kmscon/0003-font_psf-Fix-declaration-after-label-for-pre-C23-compilers.patch b/meta-oe/recipes-graphics/kmscon/kmscon/0003-font_psf-Fix-declaration-after-label-for-pre-C23-compilers.patch deleted file mode 100644 index 8bfec26d4e..0000000000 --- a/meta-oe/recipes-graphics/kmscon/kmscon/0003-font_psf-Fix-declaration-after-label-for-pre-C23-compilers.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Khem Raj -Date: Sat, 10 Oct 2026 00:00:00 +0000 -Subject: [PATCH] font_psf: Fix declaration after label for pre-C23 compilers - -kmscon builds with -std=gnu99, where a label (including a case label) -must be followed by a statement, not a declaration. Clang rejects the -"uint8_t i" declaration directly after "default:" with --Werror,-Wc23-extensions. Give the default case its own block scope. - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- ---- a/src/font/font_psf.c -+++ b/src/font/font_psf.c -@@ -394,7 +394,7 @@ - case 0xff: - ch++; - break; -- default: -+ default: { - uint8_t i = utf8_len(code.map[0]); - if (i) { - code.val = ((uint32_t)(code.map[0] & (0xFF >> (2 + i))) -@@ -408,6 +408,7 @@ - if (unicode_table_add(self, code.val, ch)) - return 1; - } -+ } - } - ucode_idx = 0; - } diff --git a/meta-oe/recipes-graphics/kmscon/kmscon_10.0.4.bb b/meta-oe/recipes-graphics/kmscon/kmscon_10.1.1.bb similarity index 89% rename from meta-oe/recipes-graphics/kmscon/kmscon_10.0.4.bb rename to meta-oe/recipes-graphics/kmscon/kmscon_10.1.1.bb index 3ece44b175..65db5115ca 100644 --- a/meta-oe/recipes-graphics/kmscon/kmscon_10.0.4.bb +++ b/meta-oe/recipes-graphics/kmscon/kmscon_10.1.1.bb @@ -21,12 +21,9 @@ DEPENDS = "\ " SRC_URI = "git://github.com/kmscon/kmscon;protocol=https;branch=main;tag=v${PV}" -SRCREV = "68fc8e1b2601e816e3a4ef95e3d8e700677509b9" +SRCREV = "55e7127eff12608f1ea52eb456cd982c94bcd5ce" SRC_URI += " \ - file://0001-uterm-treat-platform-display-controllers-as-primary-GPUs.patch \ - file://0002-vt_libseat-Fix-build-error-due-to-logging-changes.patch \ - file://0003-font_psf-Fix-declaration-after-label-for-pre-C23-compilers.patch \ " inherit meson pkgconfig systemd