diff options
author | Pekka Paalanen <pekka.paalanen@collabora.co.uk> | 2017-09-11 14:40:48 +0300 |
---|---|---|
committer | Pekka Paalanen <pekka.paalanen@collabora.co.uk> | 2018-02-12 16:49:34 +0200 |
commit | 383b3af5e1dc354c2594390a10bcd2ec494b5185 (patch) | |
tree | 49b5ba3cc974f9139128a6fddc3d8ad0429319c8 | |
parent | fc5f5d7126e8da9ff5416f15325b6ef30743ad88 (diff) | |
download | weston-383b3af5e1dc354c2594390a10bcd2ec494b5185.tar.gz |
compositor-drm: refactor into drm_mode_list_destroy()
I need to destroy the list from more places, so factor out the common
bits. No functional changes.
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Ian Ray <ian.ray@ge.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
-rw-r--r-- | libweston/compositor-drm.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/libweston/compositor-drm.c b/libweston/compositor-drm.c index d192cf3b..2f7247cf 100644 --- a/libweston/compositor-drm.c +++ b/libweston/compositor-drm.c @@ -3754,6 +3754,20 @@ drm_output_destroy_mode(struct drm_backend *backend, struct drm_mode *mode) free(mode); } +/** Destroy a list of drm_modes + * + * @param backend The backend for releasing mode property blobs. + * @param mode_list The list linked by drm_mode::base.link. + */ +static void +drm_mode_list_destroy(struct drm_backend *backend, struct wl_list *mode_list) +{ + struct drm_mode *mode, *next; + + wl_list_for_each_safe(mode, next, mode_list, base.link) + drm_output_destroy_mode(backend, mode); +} + static int drm_subpixel_to_wayland(int drm_value) { @@ -4806,7 +4820,6 @@ drm_output_destroy(struct weston_output *base) { struct drm_output *output = to_drm_output(base); struct drm_backend *b = to_drm_backend(base->compositor); - struct drm_mode *drm_mode, *next; if (output->page_flip_pending || output->vblank_pending || output->atomic_complete_pending) { @@ -4818,9 +4831,7 @@ drm_output_destroy(struct weston_output *base) if (output->base.enabled) drm_output_deinit(&output->base); - wl_list_for_each_safe(drm_mode, next, &output->base.mode_list, - base.link) - drm_output_destroy_mode(b, drm_mode); + drm_mode_list_destroy(b, &output->base.mode_list); if (output->pageflip_timer) wl_event_source_remove(output->pageflip_timer); |