diff options
| -rw-r--r-- | meta-agl-core/recipes-graphics/wayland/weston/0001-libweston-backend-drm-Re-order-gbm-destruction-at-DR.patch | 18 |
1 files changed, 9 insertions, 9 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 index e8e324c32..efcf26682 100644 --- 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 @@ -1,9 +1,7 @@ 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 +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 @@ -16,15 +14,17 @@ Fixes: #314 Signed-off-by: Marius Vlad <marius.vlad@collabora.com> Suggested-by: Daniel Stone <daniel.stone@collabora.com> +Upstream-Status: Backport [https://gitlab.freedesktop.org/wayland/weston/-/commit/d171c7b3] + --- 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 +index be2570b..3cb41bf 100644 --- a/libweston/backend-drm/drm.c +++ b/libweston/backend-drm/drm.c -@@ -3203,10 +3203,6 @@ err_drm_source: +@@ -2992,10 +2992,6 @@ err_drm_source: err_udev_input: udev_input_destroy(&b->input); err_sprite: @@ -33,9 +33,9 @@ index c780c1c16..abfcabd3b 100644 - gbm_device_destroy(b->gbm); -#endif destroy_sprites(b); - err_create_crtc_list: - drmModeFreeResources(res); -@@ -3218,6 +3214,10 @@ err_launcher: + err_udev_dev: + udev_device_unref(drm_device); +@@ -3005,6 +3001,10 @@ err_launcher: weston_launcher_destroy(compositor->launcher); err_compositor: weston_compositor_shutdown(compositor); @@ -47,5 +47,5 @@ index c780c1c16..abfcabd3b 100644 return NULL; } -- -2.33.0 +2.30.2 |