code.ossystems Code Review - openembedded-core.git/blob

   1 From c8bfa1f8d576cdc6d515dbbac36c48c6166be0d5 Mon Sep 17 00:00:00 2001
   2 From: Marius Vlad <marius.vlad@collabora.com>
   3 Date: Thu, 1 Apr 2021 00:12:00 +0300
   4 Subject: [PATCH] libweston/backend-drm: Re-order gbm destruction at DRM-backend tear down
   5
   6 Tearing down the drm-backend when there are no input devices, would call
   7 for the gbm device destruction before compositor shutdown. The latter
   8 would call into the renderer detroy function and assume that the
   9 EGLDisplay, which was created using the before-mentioned gbm device, is
  10 still available. This patch re-orders the gbm destruction after the
  11 compositor shutdown when no one would make use of it.
  12
  13 Fixes: #314
  14
  15 Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
  16 Suggested-by: Daniel Stone <daniel.stone@collabora.com>
  17
  18 Upstream-Status: Backport [https://gitlab.freedesktop.org/wayland/weston/-/commit/d171c7b3ba346c4d0bd6494f45ebf0be3c3cc5fb]
  19 ---
  20  libweston/backend-drm/drm.c | 8 ++++----
  21  1 file changed, 4 insertions(+), 4 deletions(-)
  22
  23 diff --git a/libweston/backend-drm/drm.c b/libweston/backend-drm/drm.c
  24 index 2780f3b..fbcfeca 100644
  25 --- a/libweston/backend-drm/drm.c
  26 +++ b/libweston/backend-drm/drm.c
  27 @@ -3025,10 +3025,6 @@ err_drm_source:
  28  err_udev_input:
  29         udev_input_destroy(&b->input);
  30  err_sprite:
  31 -#ifdef BUILD_DRM_GBM
  32 -       if (b->gbm)
  33 -               gbm_device_destroy(b->gbm);
  34 -#endif
  35         destroy_sprites(b);
  36  err_udev_dev:
  37         udev_device_unref(drm_device);
  38 @@ -3038,6 +3034,10 @@ err_launcher:
  39         weston_launcher_destroy(compositor->launcher);
  40  err_compositor:
  41         weston_compositor_shutdown(compositor);
  42 +#ifdef BUILD_DRM_GBM
  43 +       if (b->gbm)
  44 +               gbm_device_destroy(b->gbm);
  45 +#endif
  46         free(b);
  47         return NULL;
  48  }
  49 --
  50 2.33.0