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/0001-libweston-backend-drm-Re-order-gbm-destruction-at-DR.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/0001-libweston-backend-drm-Re-order-gbm-destruction-at-DR.patch')
-rw-r--r-- | meta-agl-core/recipes-graphics/wayland/weston/0001-libweston-backend-drm-Re-order-gbm-destruction-at-DR.patch | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/meta-agl-core/recipes-graphics/wayland/weston/0001-libweston-backend-drm-Re-order-gbm-destruction-at-DR.patch b/meta-agl-core/recipes-graphics/wayland/weston/0001-libweston-backend-drm-Re-order-gbm-destruction-at-DR.patch deleted file mode 100644 index e8e324c32..000000000 --- a/meta-agl-core/recipes-graphics/wayland/weston/0001-libweston-backend-drm-Re-order-gbm-destruction-at-DR.patch +++ /dev/null @@ -1,51 +0,0 @@ -From d171c7b3ba346c4d0bd6494f45ebf0be3c3cc5fb Mon Sep 17 00:00:00 2001 -From: Marius Vlad <marius.vlad@collabora.com> -Upstream-Status: Backport -Date: Thu, 1 Apr 2021 00:12:00 +0300 -Subject: [PATCH] libweston/backend-drm: Re-order gbm destruction at - DRM-backend tear down - -Tearing down the drm-backend when there are no input devices, would call -for the gbm device destruction before compositor shutdown. The latter -would call into the renderer detroy function and assume that the -EGLDisplay, which was created using the before-mentioned gbm device, is -still available. This patch re-orders the gbm destruction after the -compositor shutdown when no one would make use of it. - -Fixes: #314 - -Signed-off-by: Marius Vlad <marius.vlad@collabora.com> -Suggested-by: Daniel Stone <daniel.stone@collabora.com> ---- - libweston/backend-drm/drm.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/libweston/backend-drm/drm.c b/libweston/backend-drm/drm.c -index c780c1c16..abfcabd3b 100644 ---- a/libweston/backend-drm/drm.c -+++ b/libweston/backend-drm/drm.c -@@ -3203,10 +3203,6 @@ err_drm_source: - err_udev_input: - udev_input_destroy(&b->input); - err_sprite: --#ifdef BUILD_DRM_GBM -- if (b->gbm) -- gbm_device_destroy(b->gbm); --#endif - destroy_sprites(b); - err_create_crtc_list: - drmModeFreeResources(res); -@@ -3218,6 +3214,10 @@ err_launcher: - weston_launcher_destroy(compositor->launcher); - err_compositor: - weston_compositor_shutdown(compositor); -+#ifdef BUILD_DRM_GBM -+ if (b->gbm) -+ gbm_device_destroy(b->gbm); -+#endif - free(b); - return NULL; - } --- -2.33.0 - |