* [PATCH 1/4] weston-init: Do not use fbdev backend
@ 2020-09-12 21:04 Khem Raj
2020-09-12 21:04 ` [PATCH 2/4] weston: plane_add_prop() calls break musl atomic modesetting Khem Raj
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Khem Raj @ 2020-09-12 21:04 UTC (permalink / raw)
To: openembedded-core; +Cc: Khem Raj
This works ok with latest weston/kernel to use drm backend
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-graphics/wayland/weston-init/qemuall/weston.ini | 2 --
1 file changed, 2 deletions(-)
delete mode 100644 meta/recipes-graphics/wayland/weston-init/qemuall/weston.ini
diff --git a/meta/recipes-graphics/wayland/weston-init/qemuall/weston.ini b/meta/recipes-graphics/wayland/weston-init/qemuall/weston.ini
deleted file mode 100644
index 17ebd7fdab..0000000000
--- a/meta/recipes-graphics/wayland/weston-init/qemuall/weston.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[core]
-backend=fbdev-backend.so
--
2.28.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 2/4] weston: plane_add_prop() calls break musl atomic modesetting 2020-09-12 21:04 [PATCH 1/4] weston-init: Do not use fbdev backend Khem Raj @ 2020-09-12 21:04 ` Khem Raj 2020-09-15 10:30 ` [OE-core] " Ross Burton 2020-09-12 21:04 ` [PATCH 3/4] weston-init: Enable RDP screen share Khem Raj 2020-09-12 21:04 ` [PATCH 4/4] weston-init: Select drm/fbdev backends for qemu machines Khem Raj 2 siblings, 1 reply; 8+ messages in thread From: Khem Raj @ 2020-09-12 21:04 UTC (permalink / raw) To: openembedded-core; +Cc: Khem Raj This patch ensures, weston/drm backend works which ends up with blank screen on musl based systems Signed-off-by: Khem Raj <raj.khem@gmail.com> --- meta/recipes-graphics/wayland/weston-init.bb | 8 ------- .../weston/dont-use-plane-add-prop.patch | 23 +++++++++++++++++++ meta/recipes-graphics/wayland/weston_9.0.0.bb | 3 +++ 3 files changed, 26 insertions(+), 8 deletions(-) create mode 100644 meta/recipes-graphics/wayland/weston/dont-use-plane-add-prop.patch diff --git a/meta/recipes-graphics/wayland/weston-init.bb b/meta/recipes-graphics/wayland/weston-init.bb index 95d75556dc..113f0ff599 100644 --- a/meta/recipes-graphics/wayland/weston-init.bb +++ b/meta/recipes-graphics/wayland/weston-init.bb @@ -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 diff --git a/meta/recipes-graphics/wayland/weston/dont-use-plane-add-prop.patch b/meta/recipes-graphics/wayland/weston/dont-use-plane-add-prop.patch new file mode 100644 index 0000000000..a4444e5d18 --- /dev/null +++ b/meta/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/recipes-graphics/wayland/weston_9.0.0.bb b/meta/recipes-graphics/wayland/weston_9.0.0.bb index 2c526e3016..0b037a3770 100644 --- a/meta/recipes-graphics/wayland/weston_9.0.0.bb +++ b/meta/recipes-graphics/wayland/weston_9.0.0.bb @@ -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" -- 2.28.0 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [OE-core] [PATCH 2/4] weston: plane_add_prop() calls break musl atomic modesetting 2020-09-12 21:04 ` [PATCH 2/4] weston: plane_add_prop() calls break musl atomic modesetting Khem Raj @ 2020-09-15 10:30 ` Ross Burton 2020-09-15 15:54 ` Khem Raj 0 siblings, 1 reply; 8+ messages in thread From: Ross Burton @ 2020-09-15 10:30 UTC (permalink / raw) To: Khem Raj; +Cc: OE-core On Sat, 12 Sep 2020 at 22:04, Khem Raj <raj.khem@gmail.com> wrote: > +Upstream-Status: Submitted [https://gitlab.freedesktop.org/wayland/weston/-/issues/158] But that issue is closed so Rejected is a better status... Very much a workaround. Do you plan on debugging this? Ross ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [OE-core] [PATCH 2/4] weston: plane_add_prop() calls break musl atomic modesetting 2020-09-15 10:30 ` [OE-core] " Ross Burton @ 2020-09-15 15:54 ` Khem Raj 0 siblings, 0 replies; 8+ messages in thread From: Khem Raj @ 2020-09-15 15:54 UTC (permalink / raw) To: Ross Burton; +Cc: OE-core On 9/15/20 3:30 AM, Ross Burton wrote: > On Sat, 12 Sep 2020 at 22:04, Khem Raj <raj.khem@gmail.com> wrote: >> +Upstream-Status: Submitted [https://gitlab.freedesktop.org/wayland/weston/-/issues/158] > > But that issue is closed so Rejected is a better status... > > Very much a workaround. Do you plan on debugging this? > Yes, it use to only happen with drm backend and musl and now its happening all the time. > Ross > ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 3/4] weston-init: Enable RDP screen share 2020-09-12 21:04 [PATCH 1/4] weston-init: Do not use fbdev backend Khem Raj 2020-09-12 21:04 ` [PATCH 2/4] weston: plane_add_prop() calls break musl atomic modesetting Khem Raj @ 2020-09-12 21:04 ` Khem Raj 2020-09-15 10:21 ` [OE-core] " Ross Burton 2020-09-12 21:04 ` [PATCH 4/4] weston-init: Select drm/fbdev backends for qemu machines Khem Raj 2 siblings, 1 reply; 8+ messages in thread From: Khem Raj @ 2020-09-12 21:04 UTC (permalink / raw) To: openembedded-core; +Cc: Khem Raj Signed-off-by: Khem Raj <raj.khem@gmail.com> --- meta/recipes-graphics/wayland/weston-init/weston.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/wayland/weston-init/weston.ini b/meta/recipes-graphics/wayland/weston-init/weston.ini index 1e6dff68fd..b48726d59c 100644 --- a/meta/recipes-graphics/wayland/weston-init/weston.ini +++ b/meta/recipes-graphics/wayland/weston-init/weston.ini @@ -68,8 +68,8 @@ require-input=false #min_accel_factor = 0.16 #max_accel_factor = 1.0 -#[screen-share] -#command=/usr/bin/weston --backend=rdp-backend.so --shell=fullscreen-shell.so --no-clients-resize +[screen-share] +command=/usr/bin/weston --backend=rdp-backend.so --shell=fullscreen-shell.so --no-clients-resize #[xwayland] #path=/usr/bin/Xwayland -- 2.28.0 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [OE-core] [PATCH 3/4] weston-init: Enable RDP screen share 2020-09-12 21:04 ` [PATCH 3/4] weston-init: Enable RDP screen share Khem Raj @ 2020-09-15 10:21 ` Ross Burton 2020-09-15 15:56 ` Khem Raj 0 siblings, 1 reply; 8+ messages in thread From: Ross Burton @ 2020-09-15 10:21 UTC (permalink / raw) To: Khem Raj; +Cc: OE-core Is this really something we want on by default? Ross On Sat, 12 Sep 2020 at 22:04, Khem Raj <raj.khem@gmail.com> wrote: > > Signed-off-by: Khem Raj <raj.khem@gmail.com> > --- > meta/recipes-graphics/wayland/weston-init/weston.ini | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/meta/recipes-graphics/wayland/weston-init/weston.ini b/meta/recipes-graphics/wayland/weston-init/weston.ini > index 1e6dff68fd..b48726d59c 100644 > --- a/meta/recipes-graphics/wayland/weston-init/weston.ini > +++ b/meta/recipes-graphics/wayland/weston-init/weston.ini > @@ -68,8 +68,8 @@ require-input=false > #min_accel_factor = 0.16 > #max_accel_factor = 1.0 > > -#[screen-share] > -#command=/usr/bin/weston --backend=rdp-backend.so --shell=fullscreen-shell.so --no-clients-resize > +[screen-share] > +command=/usr/bin/weston --backend=rdp-backend.so --shell=fullscreen-shell.so --no-clients-resize > > #[xwayland] > #path=/usr/bin/Xwayland > -- > 2.28.0 > > ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [OE-core] [PATCH 3/4] weston-init: Enable RDP screen share 2020-09-15 10:21 ` [OE-core] " Ross Burton @ 2020-09-15 15:56 ` Khem Raj 0 siblings, 0 replies; 8+ messages in thread From: Khem Raj @ 2020-09-15 15:56 UTC (permalink / raw) To: Ross Burton; +Cc: OE-core On 9/15/20 3:21 AM, Ross Burton wrote: > Is this really something we want on by default? > it is only launched on demand, I see other layers overriding default ini file to add this so thats why I added it here so they can use this config from core. > Ross > > On Sat, 12 Sep 2020 at 22:04, Khem Raj <raj.khem@gmail.com> wrote: >> >> Signed-off-by: Khem Raj <raj.khem@gmail.com> >> --- >> meta/recipes-graphics/wayland/weston-init/weston.ini | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/meta/recipes-graphics/wayland/weston-init/weston.ini b/meta/recipes-graphics/wayland/weston-init/weston.ini >> index 1e6dff68fd..b48726d59c 100644 >> --- a/meta/recipes-graphics/wayland/weston-init/weston.ini >> +++ b/meta/recipes-graphics/wayland/weston-init/weston.ini >> @@ -68,8 +68,8 @@ require-input=false >> #min_accel_factor = 0.16 >> #max_accel_factor = 1.0 >> >> -#[screen-share] >> -#command=/usr/bin/weston --backend=rdp-backend.so --shell=fullscreen-shell.so --no-clients-resize >> +[screen-share] >> +command=/usr/bin/weston --backend=rdp-backend.so --shell=fullscreen-shell.so --no-clients-resize >> >> #[xwayland] >> #path=/usr/bin/Xwayland >> -- >> 2.28.0 >> >> ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 4/4] weston-init: Select drm/fbdev backends for qemu machines 2020-09-12 21:04 [PATCH 1/4] weston-init: Do not use fbdev backend Khem Raj 2020-09-12 21:04 ` [PATCH 2/4] weston: plane_add_prop() calls break musl atomic modesetting Khem Raj 2020-09-12 21:04 ` [PATCH 3/4] weston-init: Enable RDP screen share Khem Raj @ 2020-09-12 21:04 ` Khem Raj 2 siblings, 0 replies; 8+ messages in thread From: Khem Raj @ 2020-09-12 21:04 UTC (permalink / raw) To: openembedded-core; +Cc: Khem Raj qemux86/x86_64/aarch64 supports drm backend well, therefore enable it on these qemu machines, other qemu machines should be defaulting to fbdev, if its not qemu then leave it empty Signed-off-by: Khem Raj <raj.khem@gmail.com> --- meta/recipes-graphics/wayland/weston-init.bb | 9 +++++++++ .../wayland/weston-init/qemux86-64/weston.ini | 0 .../wayland/weston-init/qemux86/weston.ini | 0 3 files changed, 9 insertions(+) delete mode 100644 meta/recipes-graphics/wayland/weston-init/qemux86-64/weston.ini delete mode 100644 meta/recipes-graphics/wayland/weston-init/qemux86/weston.ini diff --git a/meta/recipes-graphics/wayland/weston-init.bb b/meta/recipes-graphics/wayland/weston-init.bb index 113f0ff599..07cec75fb3 100644 --- a/meta/recipes-graphics/wayland/weston-init.bb +++ b/meta/recipes-graphics/wayland/weston-init.bb @@ -15,6 +15,12 @@ SRC_URI = "file://init \ S = "${WORKDIR}" +DEFAULTBACKEND ??= "" +DEFAULTBACKEND_qemuall ?= "fbdev" +DEFAULTBACKEND_qemuarm64 = "drm" +DEFAULTBACKEND_qemux86 = "drm" +DEFAULTBACKEND_qemux86-64 = "drm" + do_install() { install -Dm755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/weston install -D -p -m0644 ${WORKDIR}/weston.ini ${D}${sysconfdir}/xdg/weston/weston.ini @@ -36,6 +42,9 @@ do_install() { install -Dm755 ${WORKDIR}/weston-start ${D}${bindir}/weston-start sed -i 's,@DATADIR@,${datadir},g' ${D}${bindir}/weston-start sed -i 's,@LOCALSTATEDIR@,${localstatedir},g' ${D}${bindir}/weston-start + if [ -n "${DEFAULTBACKEND}" ]; then + sed -i -e "/^\[core\]/a backend=${DEFAULTBACKEND}-backend.so" ${D}${sysconfdir}/xdg/weston/weston.ini + fi } inherit update-rc.d features_check systemd diff --git a/meta/recipes-graphics/wayland/weston-init/qemux86-64/weston.ini b/meta/recipes-graphics/wayland/weston-init/qemux86-64/weston.ini deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/meta/recipes-graphics/wayland/weston-init/qemux86/weston.ini b/meta/recipes-graphics/wayland/weston-init/qemux86/weston.ini deleted file mode 100644 index e69de29bb2..0000000000 -- 2.28.0 ^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2020-09-15 15:56 UTC | newest] Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-09-12 21:04 [PATCH 1/4] weston-init: Do not use fbdev backend Khem Raj 2020-09-12 21:04 ` [PATCH 2/4] weston: plane_add_prop() calls break musl atomic modesetting Khem Raj 2020-09-15 10:30 ` [OE-core] " Ross Burton 2020-09-15 15:54 ` Khem Raj 2020-09-12 21:04 ` [PATCH 3/4] weston-init: Enable RDP screen share Khem Raj 2020-09-15 10:21 ` [OE-core] " Ross Burton 2020-09-15 15:56 ` Khem Raj 2020-09-12 21:04 ` [PATCH 4/4] weston-init: Select drm/fbdev backends for qemu machines Khem Raj
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.