mirrors/meta-ti
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-ti synced 2026-07-27 14:28:05 +00:00
Code Issues Projects Releases Wiki Activity

weston: fix assert firing when subsurfaces have no views

Browse Source 
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>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
This commit is contained in:
Thorsten Lannynd
2026-06-01 12:19:23 -05:00
committed by Ryan Eatmon
parent 5985cc8955
commit 6949fcde94
2 changed files with 48 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-ti-bsp/recipes-graphics/wayland/weston-ti-version.inc
+1
View File
@@ -4,4 +4,5 @@ PR:append = ".tisoc1"
SRC_URI += " \ SRC_URI += " \
file://0001-Revert-require-GL_EXT_unpack_subimage-commit.patch \ file://0001-Revert-require-GL_EXT_unpack_subimage-commit.patch \
file://0002-surface-state-Fix-assert-firing-when-subsurfaces-hav.patch \
" "
meta-ti-bsp/recipes-graphics/wayland/weston/0002-surface-state-Fix-assert-firing-when-subsurfaces-hav.patch
+47
View File
@@ -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