mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

backend-drm: Use weston_compositor.shutting_down

Browse Source 
We previously had our own local variable for this, but now we can just
use the one in weston_compositor.

Signed-off-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
Daniel Stone 2023-05-01 23:38:22 +01:00
parent 579019a78d
commit 9aa68248a9
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libweston/backend-drm/drm-gbm.c
View File

@ -285,7 +285,7 @@ drm_output_fini_egl(struct drm_output *output)
/* Destroying the GBM surface will destroy all our GBM buffers,
* regardless of refcount. Ensure we destroy them here. */
if (!b->shutting_down &&
if (!b->compositor->shutting_down &&
output->scanout_plane->state_cur->fb &&
output->scanout_plane->state_cur->fb->type == BUFFER_GBM_SURFACE) {
drm_plane_reset_state(output->scanout_plane);

2
libweston/backend-drm/drm-internal.h
View File

@ -374,8 +374,6 @@ struct drm_backend {
uint32_t pageflip_timeout;
bool shutting_down;
struct weston_log_scope *debug;
};

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

@ -1490,7 +1490,7 @@ drm_output_fini_pixman(struct drm_output *output)
/* Destroying the Pixman surface will destroy all our buffers,
* regardless of refcount. Ensure we destroy them here. */
if (!b->shutting_down &&
if (!b->compositor->shutting_down &&
output->scanout_plane->state_cur->fb &&
output->scanout_plane->state_cur->fb->type == BUFFER_PIXMAN_DUMB) {
drm_plane_reset_state(output->scanout_plane);
@ -1970,7 +1970,7 @@ drm_output_deinit_planes(struct drm_output *output)
/* If the compositor is already shutting down, the planes have already
* been destroyed. */
if (!b->shutting_down) {
if (!b->compositor->shutting_down) {
wl_list_remove(&output->scanout_plane->base.link);
wl_list_init(&output->scanout_plane->base.link);
@ -2173,7 +2173,7 @@ drm_output_deinit(struct weston_output *base)
struct drm_device *device = b->drm;
struct drm_pending_state *pending;
if (!b->shutting_down) {
if (!b->compositor->shutting_down) {
pending = drm_pending_state_alloc(device);
drm_output_get_disable_state(pending, output);
drm_pending_state_apply_sync(pending);
@ -3174,8 +3174,6 @@ drm_destroy(struct weston_backend *backend)
wl_event_source_remove(b->udev_drm_source);
wl_event_source_remove(b->drm_source);
b->shutting_down = true;
destroy_sprites(b->drm);
weston_log_scope_destroy(b->debug);