Skip to content
Snippets Groups Projects
Commit 29b92ebb authored by Pavel Zhukov's avatar Pavel Zhukov
Browse files

weston: plane_add_prop() calls break weston with musl


Upstream-commit: b3a5b64f717b39536c96627ce058cf9c51cf3ba6
Upstream-status: Backport
Signed-off-by: default avatarPavel Zhukov <pavel.zhukov@huawei.com>

Closes: https://git.ostc-eu.org/OSTC/OHOS/meta-ohos/-/issues/119
parent aef1420e
No related branches found
No related tags found
No related merge requests found
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;
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
SRC_URI += "file://systemd-notify.weston-start" SRC_URI += "file://systemd-notify.weston-start"
SRC_URI_append_libc-musl = " file://dont-use-plane-add-prop.patch"
do_install_append() { do_install_append() {
install -Dm 644 ${WORKDIR}/systemd-notify.weston-start ${D}${datadir}/weston-start/systemd-notify install -Dm 644 ${WORKDIR}/systemd-notify.weston-start ${D}${datadir}/weston-start/systemd-notify
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment