summaryrefslogtreecommitdiffstats
path: root/recipes-graphics/wayland/weston
diff options
context:
space:
mode:
authorTom Hochstein <tom.hochstein@nxp.com>2022-01-28 11:25:21 -0600
committerTom Hochstein <tom.hochstein@nxp.com>2022-01-29 16:10:03 -0600
commiteb58cacc94dbcd7c670da9c320fbaf500e66c5af (patch)
tree54f031c23ca670329c2df8deeeffe6313104a58f /recipes-graphics/wayland/weston
parentbf81d436d8050a7b8fd04b622ed3b6036b91259a (diff)
downloadmeta-freescale-eb58cacc94dbcd7c670da9c320fbaf500e66c5af.tar.gz
weston: Adjust base patch for fork
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
Diffstat (limited to 'recipes-graphics/wayland/weston')
-rw-r--r--recipes-graphics/wayland/weston/0001-libweston-backend-drm-Re-order-gbm-destruction-at-DR.patch18
1 files changed, 10 insertions, 8 deletions
diff --git a/recipes-graphics/wayland/weston/0001-libweston-backend-drm-Re-order-gbm-destruction-at-DR.patch b/recipes-graphics/wayland/weston/0001-libweston-backend-drm-Re-order-gbm-destruction-at-DR.patch
index f8f75894..db640055 100644
--- a/recipes-graphics/wayland/weston/0001-libweston-backend-drm-Re-order-gbm-destruction-at-DR.patch
+++ b/recipes-graphics/wayland/weston/0001-libweston-backend-drm-Re-order-gbm-destruction-at-DR.patch
@@ -1,7 +1,8 @@
1From c8bfa1f8d576cdc6d515dbbac36c48c6166be0d5 Mon Sep 17 00:00:00 2001 1From 4be82f75a47bd456452ab713d7d57a75d844f42a Mon Sep 17 00:00:00 2001
2From: Marius Vlad <marius.vlad@collabora.com> 2From: Marius Vlad <marius.vlad@collabora.com>
3Date: Thu, 1 Apr 2021 00:12:00 +0300 3Date: Thu, 1 Apr 2021 00:12:00 +0300
4Subject: [PATCH] libweston/backend-drm: Re-order gbm destruction at DRM-backend tear down 4Subject: [PATCH] libweston/backend-drm: Re-order gbm destruction at
5 DRM-backend tear down
5 6
6Tearing down the drm-backend when there are no input devices, would call 7Tearing down the drm-backend when there are no input devices, would call
7for the gbm device destruction before compositor shutdown. The latter 8for the gbm device destruction before compositor shutdown. The latter
@@ -21,13 +22,13 @@ Upstream-Status: Backport [https://gitlab.freedesktop.org/wayland/weston/-/commi
21 1 file changed, 4 insertions(+), 4 deletions(-) 22 1 file changed, 4 insertions(+), 4 deletions(-)
22 23
23diff --git a/libweston/backend-drm/drm.c b/libweston/backend-drm/drm.c 24diff --git a/libweston/backend-drm/drm.c b/libweston/backend-drm/drm.c
24index 2780f3b..fbcfeca 100644 25index 9d3b5dcc..67834d3e 100644
25--- a/libweston/backend-drm/drm.c 26--- a/libweston/backend-drm/drm.c
26+++ b/libweston/backend-drm/drm.c 27+++ b/libweston/backend-drm/drm.c
27@@ -3025,10 +3025,6 @@ err_drm_source: 28@@ -3402,10 +3402,6 @@ err_drm_source:
29 wl_event_source_remove(b->drm_source);
28 err_udev_input: 30 err_udev_input:
29 udev_input_destroy(&b->input); 31 udev_input_destroy(&b->input);
30 err_sprite:
31-#ifdef BUILD_DRM_GBM 32-#ifdef BUILD_DRM_GBM
32- if (b->gbm) 33- if (b->gbm)
33- gbm_device_destroy(b->gbm); 34- gbm_device_destroy(b->gbm);
@@ -35,7 +36,7 @@ index 2780f3b..fbcfeca 100644
35 destroy_sprites(b); 36 destroy_sprites(b);
36 err_udev_dev: 37 err_udev_dev:
37 udev_device_unref(drm_device); 38 udev_device_unref(drm_device);
38@@ -3038,6 +3034,10 @@ err_launcher: 39@@ -3415,6 +3411,10 @@ err_launcher:
39 weston_launcher_destroy(compositor->launcher); 40 weston_launcher_destroy(compositor->launcher);
40 err_compositor: 41 err_compositor:
41 weston_compositor_shutdown(compositor); 42 weston_compositor_shutdown(compositor);
@@ -46,5 +47,6 @@ index 2780f3b..fbcfeca 100644
46 free(b); 47 free(b);
47 return NULL; 48 return NULL;
48 } 49 }
49-- 50--
502.33.0 512.17.1
52