| Message ID | 20260601171923.1728139-1-t-lannynd@ti.com |
|---|---|
| State | Under Review |
| Delegated to: | Ryan Eatmon |
| Headers | show |
| Series | [meta-ti,master/wrynose] weston: fix assert firing when subsurfaces have no views | expand |
meta-ti / na / 20260601171923.1728139-1-t-lannynd PRC Results: PASS ========================================================= check-yocto-patches: PASS ========================================================= Patches ---------------------------------------- All patches passed ========================================================= apply-yocto-patch: PASS ========================================================= master ===================== Summary: - Patch Series: [meta-ti][master/wrynose][PATCH] weston: fix assert firing when subsurfaces have no views - Submitter: From: Thorsten Lannynd <t-lannynd@ti.com> +From: Derek Foreman <derek.foreman@collabora.com> - Date: Date: Mon, 1 Jun 2026 12:19:23 -0500 +Date: Wed, 27 May 2026 14:12:36 -0500 - Num Patches: 1 - Mailing List (public inbox) Commit SHA: b3ac98dce1b250a52a616aa49e52b977dae0fff9 Applied to: - Repository: lcpd-prc-meta-ti - Base Branch: master-wip - Commit Author: Ryan Eatmon <reatmon@ti.com> - Commit Subject: conf: Add falcon support natively - Commit SHA: bdc0a2cee531b4320110a6a39467f1b7cf1a9969 Patches ---------------------------------------- All patches applied wrynose ===================== Summary: - Patch Series: [meta-ti][master/wrynose][PATCH] weston: fix assert firing when subsurfaces have no views - Submitter: From: Thorsten Lannynd <t-lannynd@ti.com> +From: Derek Foreman <derek.foreman@collabora.com> - Date: Date: Mon, 1 Jun 2026 12:19:23 -0500 +Date: Wed, 27 May 2026 14:12:36 -0500 - Num Patches: 1 - Mailing List (public inbox) Commit SHA: b3ac98dce1b250a52a616aa49e52b977dae0fff9 Applied to: - Repository: lcpd-prc-meta-ti - Base Branch: wrynose-wip - Commit Author: Suhaas Joshi <s-joshi@ti.com> - Commit Subject: meta-ti: optee: Update to 4.10.0 tag - Commit SHA: 42558bf1f1b1ec3224a957e6ac51c7e7ec83b427 Patches ---------------------------------------- All patches applied ========================================================= check-yocto-repo: PASS ========================================================= master ===================== PASS wrynose ===================== PASS ========================================================= yocto-check-layers: PASS ========================================================= master - PASS ===================== All checks passed wrynose - PASS ===================== All checks passed
diff --git a/meta-ti-bsp/recipes-graphics/wayland/weston-ti-version.inc b/meta-ti-bsp/recipes-graphics/wayland/weston-ti-version.inc index 42e6b6ac..c8624f0e 100644 --- a/meta-ti-bsp/recipes-graphics/wayland/weston-ti-version.inc +++ b/meta-ti-bsp/recipes-graphics/wayland/weston-ti-version.inc @@ -4,4 +4,5 @@ PR:append = ".tisoc1" SRC_URI += " \ file://0001-Revert-require-GL_EXT_unpack_subimage-commit.patch \ + file://0002-surface-state-Fix-assert-firing-when-subsurfaces-hav.patch \ " diff --git a/meta-ti-bsp/recipes-graphics/wayland/weston/0002-surface-state-Fix-assert-firing-when-subsurfaces-hav.patch b/meta-ti-bsp/recipes-graphics/wayland/weston/0002-surface-state-Fix-assert-firing-when-subsurfaces-hav.patch new file mode 100644 index 00000000..d370577c --- /dev/null +++ b/meta-ti-bsp/recipes-graphics/wayland/weston/0002-surface-state-Fix-assert-firing-when-subsurfaces-hav.patch @@ -0,0 +1,47 @@ +From 12ecd8d4b5095c120efef76493546ead3f41ab5b Mon Sep 17 00:00:00 2001 +From: Derek Foreman <derek.foreman@collabora.com> +Date: Wed, 27 May 2026 14:12:36 -0500 +Subject: [PATCH] surface-state: Fix assert firing when subsurfaces have no + views + +Upstream-Status: Submitted [https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/2085] + +I've not been able to reproduce this, but have a report that this fires +when running Chromium on aarch64. + +It seems plausible that we can get here when none of the subsurfaces have +views, and thus the flag won't be set. + +Let's just remove the assert. + +Fixes 6a280a8f +Fixes #1117 + +Signed-off-by: Derek Foreman <derek.foreman@collabora.com> +Signed-off-by: Thorsten Lannynd <t-lannynd@ti.com> +--- + libweston/surface-state.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/libweston/surface-state.c b/libweston/surface-state.c +index 3c31a0aa..65dc70bb 100644 +--- a/libweston/surface-state.c ++++ b/libweston/surface-state.c +@@ -268,7 +268,6 @@ weston_surface_attach(struct weston_surface *surface, + static void + weston_surface_apply_subsurface_order(struct weston_surface *surface) + { +- struct weston_compositor *comp = surface->compositor; + struct weston_subsurface *sub; + struct weston_view *view; + +@@ -279,7 +278,6 @@ weston_surface_apply_subsurface_order(struct weston_surface *surface) + wl_list_for_each(view, &sub->surface->views, surface_link) + weston_view_geometry_dirty(view); + } +- weston_assert_true(comp, comp->view_list_needs_rebuild); + } + + /* Translate pending damage in buffer co-ordinates to surface +-- +2.34.1
Apply upstream candidate fix for an assert in weston_surface_apply_subsurface_order that fires when subsurfaces have no views. Without this patch, the assert fires when running Chromium and causes the display to crash. Signed-off-by: Thorsten Lannynd <t-lannynd@ti.com> --- .../wayland/weston-ti-version.inc | 1 + ...x-assert-firing-when-subsurfaces-hav.patch | 47 +++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 meta-ti-bsp/recipes-graphics/wayland/weston/0002-surface-state-Fix-assert-firing-when-subsurfaces-hav.patch