From 54ec17ff643b3682cadba5984a2e1ed40161ce36 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Wed, 23 Dec 2020 12:14:36 +0100 Subject: [PATCH] backend/drm: use plural form for possible_crtcs Make it clearer that this is a bitmask of CRTC indices. --- backend/drm/drm.c | 8 ++++---- include/backend/drm/drm.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/drm/drm.c b/backend/drm/drm.c index d1e6cc5d..d35e349c 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -1014,7 +1014,7 @@ static void drm_connector_destroy_output(struct wlr_output *output) { conn->state = WLR_DRM_CONN_DISCONNECTED; conn->desired_enabled = false; conn->desired_mode = NULL; - conn->possible_crtc = 0; + conn->possible_crtcs = 0; conn->pageflip_pending = false; struct wlr_drm_mode *mode, *mode_tmp; @@ -1113,7 +1113,7 @@ static void realloc_crtcs(struct wlr_drm_backend *drm) { if ((conn->state == WLR_DRM_CONN_CONNECTED || conn->state == WLR_DRM_CONN_NEEDS_MODESET) && conn->desired_enabled) { - connector_constraints[i] = conn->possible_crtc; + connector_constraints[i] = conn->possible_crtcs; } else { // Will always fail to match anything connector_constraints[i] = 0; @@ -1381,8 +1381,8 @@ void scan_drm_connectors(struct wlr_drm_backend *drm) { wl_list_insert(&wlr_conn->output.modes, &mode->wlr_mode.link); } - wlr_conn->possible_crtc = get_possible_crtcs(drm->fd, res, drm_conn); - if (wlr_conn->possible_crtc == 0) { + wlr_conn->possible_crtcs = get_possible_crtcs(drm->fd, res, drm_conn); + if (wlr_conn->possible_crtcs == 0) { wlr_drm_conn_log(wlr_conn, WLR_ERROR, "No CRTC possible"); } diff --git a/include/backend/drm/drm.h b/include/backend/drm/drm.h index 6c8939e8..426b5fe3 100644 --- a/include/backend/drm/drm.h +++ b/include/backend/drm/drm.h @@ -119,7 +119,7 @@ struct wlr_drm_connector { uint32_t id; struct wlr_drm_crtc *crtc; - uint32_t possible_crtc; + uint32_t possible_crtcs; union wlr_drm_connector_props props;