diff mbox series

[meta-arago,master/wrynose] weston: fix assert firing when subsurfaces have no views

Message ID 20260601170844.1723390-1-t-lannynd@ti.com
State New
Headers show
Series [meta-arago,master/wrynose] weston: fix assert firing when subsurfaces have no views | expand

Commit Message

Thorsten Lannynd June 1, 2026, 5:08 p.m. UTC 
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

Comments

PRC Automation June 1, 2026, 5:10 p.m. UTC | #1 
meta-arago / na / 20260601170844.1723390-1-t-lannynd

PRC Results: FAIL

=========================================================
  check-yocto-patches: PASS
=========================================================
Patches
----------------------------------------
All patches passed



=========================================================
  apply-yocto-patch: FAIL
=========================================================
master
=====================
Summary:
- Patch Series: [meta-arago][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:08:44 -0500
+Date: Wed, 27 May 2026 14:12:36 -0500
- Num Patches: 1
- Mailing List (public inbox) Commit SHA: 7f41b6c3ff2986c3e09bde805cf125a6de8d309a

Applied to:
- Repository: lcpd-prc-meta-arago
- Base Branch: master
- Commit Author: Thorsten Lannynd <t-lannynd@ti.com>
- Commit Subject: meta-arago: chromium: clean up and simplify V4L2 patch series
- Commit SHA: 30a611f56a4bd74d421e36ecddf705b956c01648

Patches
----------------------------------------
FAIL - [meta-arago][master/wrynose][PATCH] weston: fix assert firing when subsurfaces have no views
    error: meta-ti-bsp/recipes-graphics/wayland/weston-ti-version.inc: does not exist in index
    Applying: weston: fix assert firing when subsurfaces have no views
    Patch failed at 0001 weston: fix assert firing when subsurfaces have no views

wrynose
=====================
Summary:
- Patch Series: [meta-arago][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:08:44 -0500
+Date: Wed, 27 May 2026 14:12:36 -0500
- Num Patches: 1
- Mailing List (public inbox) Commit SHA: 7f41b6c3ff2986c3e09bde805cf125a6de8d309a

Applied to:
- Repository: lcpd-prc-meta-arago
- Base Branch: wrynose
- Commit Author: Ryan Eatmon <reatmon@ti.com>
- Commit Subject: meta-arago-test: Moved to meta-ti/meta-ti-test
- Commit SHA: e9bf10c0e71b08fe827200af575f9c9749be7bc2

Patches
----------------------------------------
FAIL - [meta-arago][master/wrynose][PATCH] weston: fix assert firing when subsurfaces have no views
    error: meta-ti-bsp/recipes-graphics/wayland/weston-ti-version.inc: does not exist in index
    Applying: weston: fix assert firing when subsurfaces have no views
    Patch failed at 0001 weston: fix assert firing when subsurfaces have no views
diff mbox series

Patch

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