mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-02 18:32:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

weston: plane_add_prop() calls break musl atomic modesetting

Browse Source 
This patch ensures, weston/drm backend works which ends up with blank
screen on musl based systems

(From OE-Core rev: b3a5b64f717b39536c96627ce058cf9c51cf3ba6)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2020-09-12 14:04:04 -07:00
committed by Richard Purdie
parent 602066af70
commit 30ed002d21
3 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
meta/recipes-graphics/wayland/weston-init.bb
View File

@@ -38,14 +38,6 @@ do_install() {
sed -i 's,@LOCALSTATEDIR@,${localstatedir},g' ${D}${bindir}/weston-start
}
do_install_append_libc-musl_qemux86() {
echo "WESTON_DISABLE_ATOMIC=Y" >> ${D}${sysconfdir}/default/weston
}
do_install_append_libc-musl_qemux86-64() {
echo "WESTON_DISABLE_ATOMIC=Y" >> ${D}${sysconfdir}/default/weston
}
inherit update-rc.d features_check systemd
# rdepends on weston which depends on virtual/egl

23
meta/recipes-graphics/wayland/weston/dont-use-plane-add-prop.patch Normal file
View File

@@ -0,0 +1,23 @@
Fix atomic modesetting with musl
atomic modesetting seems to fail with drm weston backend and this patch fixes
it, below errors are seen before weston exits
atomic: couldn't commit new state: Invalid argument
Upstream-Status: Submitted [https://gitlab.freedesktop.org/wayland/weston/-/issues/158]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
--- a/libweston/backend-drm/kms.c
+++ b/libweston/backend-drm/kms.c
@@ -1168,8 +1168,8 @@ drm_pending_state_apply_atomic(struct dr
wl_list_for_each(plane, &b->plane_list, link) {
drm_debug(b, "\t\t[atomic] starting with plane %lu disabled\n",
(unsigned long) plane->plane_id);
- plane_add_prop(req, plane, WDRM_PLANE_CRTC_ID, 0);
- plane_add_prop(req, plane, WDRM_PLANE_FB_ID, 0);
+ //plane_add_prop(req, plane, WDRM_PLANE_CRTC_ID, 0);
+ //plane_add_prop(req, plane, WDRM_PLANE_FB_ID, 0);
}
flags |= DRM_MODE_ATOMIC_ALLOW_MODESET;

3
meta/recipes-graphics/wayland/weston_9.0.0.bb
View File

@@ -12,6 +12,9 @@ SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \
file://0001-tests-include-fcntl.h-for-open-O_RDWR-O_CLOEXEC-and-.patch \
"
SRC_URI_append_libc-musl = " file://dont-use-plane-add-prop.patch "
SRC_URI[sha256sum] = "5cf5d6ce192e0eb15c1fc861a436bf21b5bb3b91dbdabbdebe83e1f83aa098fe"
UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html"