From 923258b0bedef4ef9cfc02b5c30b8cb8c51ec0f8 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Fri, 30 Jul 2021 23:02:30 +0200 Subject: [PATCH] backend/drm: preserve mode order from kernel The kernel orders the mode list from highest to lowest. Preserve this ordering in the wlr_output.modes list. --- backend/drm/drm.c | 2 +- types/wlr_output.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/drm/drm.c b/backend/drm/drm.c index e7628e2d..cd161e02 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -1385,7 +1385,7 @@ void scan_drm_connectors(struct wlr_drm_backend *drm) { mode->wlr_mode.refresh, mode->wlr_mode.preferred ? "(preferred)" : ""); - wl_list_insert(&wlr_conn->output.modes, &mode->wlr_mode.link); + wl_list_insert(wlr_conn->output.modes.prev, &mode->wlr_mode.link); } wlr_conn->possible_crtcs = get_possible_crtcs(drm->fd, res, drm_conn); diff --git a/types/wlr_output.c b/types/wlr_output.c index 6d399616..47ee55be 100644 --- a/types/wlr_output.c +++ b/types/wlr_output.c @@ -457,8 +457,8 @@ struct wlr_output_mode *wlr_output_preferred_mode(struct wlr_output *output) { } } - // No preferred mode, choose the last one - return wl_container_of(output->modes.prev, mode, link); + // No preferred mode, choose the first one + return wl_container_of(output->modes.next, mode, link); } static void output_state_clear_buffer(struct wlr_output_state *state) {