system/weston
system/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston synced 2024-07-24 04:04:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

libweston/backend-drm: Re-order gbm destruction at DRM-backend tear down

Browse source 
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>
This commit is contained in:
Marius Vlad 2021-04-01 00:12:00 +03:00
parent 8df8532ee5
commit d171c7b3ba
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libweston/backend-drm/drm.c
View file

@ -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;
}