summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2022-08-11 21:58:03 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-08-28 07:51:30 +0100
commit3e3e985aba7f4e0c34cfabac0790343821d0e55d (patch)
treec6e55cbce82aa11e05b6bac1699bfb82131962ba
parent430ad987d4424351704a22faee662e36d7ea368e (diff)
downloadpoky-3e3e985aba7f4e0c34cfabac0790343821d0e55d.tar.gz
weston: upgrade 10.0.1 -> 10.0.2
This is a bugfix release Full commit history below. Daniel Stone (1): tests: Use test-desktop-shell for devices-test Pekka Paalanen (1): tests: preserve ivi runner section Simon Ser (1): build: bump to version 10.0.2 for the point release Drop dont-use-plane-add-prop.patch as issue is fixed elsewhere (see the link in the patch). (From OE-Core rev: 457900220ca6bfbda8b3e7485bac3c0c92d05a7f) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit ed54ef8f094fb6759316781a5ac626af40ad8ffc) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/wayland/weston/dont-use-plane-add-prop.patch32
-rw-r--r--meta/recipes-graphics/wayland/weston_10.0.2.bb (renamed from meta/recipes-graphics/wayland/weston_10.0.1.bb)4
2 files changed, 1 insertions, 35 deletions
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
deleted file mode 100644
index 1ac0695222..0000000000
--- a/meta/recipes-graphics/wayland/weston/dont-use-plane-add-prop.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From ece4c3d261aeec230869c0304ed1011ff6837c16 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 12 Sep 2020 14:04:04 -0700
4Subject: [PATCH] Fix atomic modesetting with musl
5
6atomic modesetting seems to fail with drm weston backend and this patch fixes
7it, below errors are seen before weston exits
8
9atomic: couldn't commit new state: Invalid argument
10
11Upstream-Status: Submitted [https://gitlab.freedesktop.org/wayland/weston/-/issues/158]
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13
14---
15 libweston/backend-drm/kms.c | 4 ++--
16 1 file changed, 2 insertions(+), 2 deletions(-)
17
18diff --git a/libweston/backend-drm/kms.c b/libweston/backend-drm/kms.c
19index 780d007..9994da1 100644
20--- a/libweston/backend-drm/kms.c
21+++ b/libweston/backend-drm/kms.c
22@@ -1142,8 +1142,8 @@ drm_pending_state_apply_atomic(struct drm_pending_state *pending_state,
23 wl_list_for_each(plane, &b->plane_list, link) {
24 drm_debug(b, "\t\t[atomic] starting with plane %lu disabled\n",
25 (unsigned long) plane->plane_id);
26- plane_add_prop(req, plane, WDRM_PLANE_CRTC_ID, 0);
27- plane_add_prop(req, plane, WDRM_PLANE_FB_ID, 0);
28+ //plane_add_prop(req, plane, WDRM_PLANE_CRTC_ID, 0);
29+ //plane_add_prop(req, plane, WDRM_PLANE_FB_ID, 0);
30 }
31
32 flags |= DRM_MODE_ATOMIC_ALLOW_MODESET;
diff --git a/meta/recipes-graphics/wayland/weston_10.0.1.bb b/meta/recipes-graphics/wayland/weston_10.0.2.bb
index e27dac164e..f81a33fd1e 100644
--- a/meta/recipes-graphics/wayland/weston_10.0.1.bb
+++ b/meta/recipes-graphics/wayland/weston_10.0.2.bb
@@ -13,9 +13,7 @@ SRC_URI = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}/downlo
13 file://systemd-notify.weston-start \ 13 file://systemd-notify.weston-start \
14 " 14 "
15 15
16SRC_URI:append:libc-musl = " file://dont-use-plane-add-prop.patch " 16SRC_URI[sha256sum] = "89646ca0d9f8d413c2767e5c3828eaa3fa149c2a105b3729a6894fa7cf1549e7"
17
18SRC_URI[sha256sum] = "8a9e52506a865a7410981b04f8341b89b84106db8531ab1f9fdd37b5dc034115"
19 17
20UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" 18UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html"
21 19