diff --git a/meta-ohos-core/recipes-graphics/wayland/weston/dont-use-plane-add-prop.patch b/meta-ohos-core/recipes-graphics/wayland/weston/dont-use-plane-add-prop.patch new file mode 100644 index 0000000000000000000000000000000000000000..a4444e5d1859c848253ae485757bf076b5bdc73e --- /dev/null +++ b/meta-ohos-core/recipes-graphics/wayland/weston/dont-use-plane-add-prop.patch @@ -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; diff --git a/meta-ohos-core/recipes-graphics/wayland/weston_8.0.0.bbappend b/meta-ohos-core/recipes-graphics/wayland/weston_8.0.0.bbappend index dd347610a7eb825eb321a8b1401a8cc096491f91..affce70b5d990e4bee8bd0fb20bef41a67ce3ba0 100644 --- a/meta-ohos-core/recipes-graphics/wayland/weston_8.0.0.bbappend +++ b/meta-ohos-core/recipes-graphics/wayland/weston_8.0.0.bbappend @@ -4,6 +4,8 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += "file://systemd-notify.weston-start" +SRC_URI_append_libc-musl = " file://dont-use-plane-add-prop.patch" + do_install_append() { install -Dm 644 ${WORKDIR}/systemd-notify.weston-start ${D}${datadir}/weston-start/systemd-notify }