diff options
author | Scott Murray <scott.murray@konsulko.com> | 2021-02-23 16:26:14 -0500 |
---|---|---|
committer | Scott Murray <scott.murray@konsulko.com> | 2022-03-29 15:23:29 -0400 |
commit | 47bf86a3e5d9015f504de4d64942bd17a643b4e6 (patch) | |
tree | ba310fc58601e67e98d18ffca2a06500c28a7ab5 /meta-agl-core/recipes-graphics/wayland/weston/0005-correctly-tear-down-drm-backend.patch | |
parent | 50afe15c9db1a770428bc32cda413997b7c2b176 (diff) |
meta-agl-core: update weston
Update weston bbappend for weston 10.0 in poky master, and remove
now upstreamed patches.
Bug-AGL: SPEC-3819
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I5d10435ec9b7c18bb36e8a88f6853f1628e5b052
Diffstat (limited to 'meta-agl-core/recipes-graphics/wayland/weston/0005-correctly-tear-down-drm-backend.patch')
-rw-r--r-- | meta-agl-core/recipes-graphics/wayland/weston/0005-correctly-tear-down-drm-backend.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/meta-agl-core/recipes-graphics/wayland/weston/0005-correctly-tear-down-drm-backend.patch b/meta-agl-core/recipes-graphics/wayland/weston/0005-correctly-tear-down-drm-backend.patch deleted file mode 100644 index cb122590b..000000000 --- a/meta-agl-core/recipes-graphics/wayland/weston/0005-correctly-tear-down-drm-backend.patch +++ /dev/null @@ -1,37 +0,0 @@ -commit 5130a8c21a9deea54e8f7c96a3a5049e2d60a210 -Author: Marius Vlad <marius.vlad@collabora.com> -Date: Thu Jul 30 14:47:32 2020 +0300 - -backend-drm: Correctly tear down the DRM backend - -It seem that we skipped to put back in TEXT mode the tty, in case a DRM -device node wasn't present at that time, or it isn't present at all. This -orders the destroy part correctly as to handle that case as well. - -As a side effect, as the tty will still be set to GRAPHICS mode we will -require a manual change of the tty number, which might be not possible -on all systems. Properly putting back the tty to TEXT mode should avoid -that, and allows to re-use the same tty no in case the DRM device has -been created at a later point in time. - -Upstream-Status: Backport -Signed-off-by: Marius Vlad <marius.vlad@collabora.com> -Signed-off-by: Scott Murray <scott.murray@konsulko.com> - -diff --git a/libweston/backend-drm/drm.c b/libweston/backend-drm/drm.c -index 980a12da..1cf61a33 100644 ---- a/libweston/backend-drm/drm.c -+++ b/libweston/backend-drm/drm.c -@@ -3031,10 +3031,10 @@ err_sprite: - destroy_sprites(b); - err_udev_dev: - udev_device_unref(drm_device); --err_launcher: -- weston_launcher_destroy(compositor->launcher); - err_udev: - udev_unref(b->udev); -+err_launcher: -+ weston_launcher_destroy(compositor->launcher); - err_compositor: - weston_compositor_shutdown(compositor); - free(b); |