From 549777ca19b2040ff0824ac7764bbe1cb834e953 Mon Sep 17 00:00:00 2001
From: Versus Void <versusvoid@gmail.com>
Date: Sun, 22 Oct 2017 21:38:30 +0000
Subject: [PATCH] Set crtc field when scanning for DRM connectors and always
 use it when matching CRTCs with connectors. Fix deactivated monitors check.

---
 backend/drm/drm.c | 57 ++++++++++++++++++++++++++++++++---------------
 1 file changed, 39 insertions(+), 18 deletions(-)

diff --git a/backend/drm/drm.c b/backend/drm/drm.c
index cd3208d3..94923d04 100644
--- a/backend/drm/drm.c
+++ b/backend/drm/drm.c
@@ -314,7 +314,8 @@ static void realloc_crtcs(struct wlr_drm_backend *drm,
 		struct wlr_drm_connector *conn, bool *changed_outputs) {
 	uint32_t crtc[drm->num_crtcs];
 	uint32_t crtc_res[drm->num_crtcs];
-	uint32_t possible_crtc[wl_list_length(&drm->outputs)];
+	ssize_t num_outputs = wl_list_length(&drm->outputs);
+	uint32_t possible_crtc[num_outputs];
 
 	for (size_t i = 0; i < drm->num_crtcs; ++i) {
 		crtc[i] = UNMATCHED;
@@ -330,35 +331,41 @@ static void realloc_crtcs(struct wlr_drm_backend *drm,
 			index = i;
 		}
 
-		if (c->state != WLR_DRM_CONN_CONNECTED) {
-			continue;
+		if (c->crtc) {
+			crtc[c->crtc - drm->crtcs] = i;
+		}
+
+		if (c->state == WLR_DRM_CONN_CONNECTED) {
+			possible_crtc[i] = c->possible_crtc;
 		}
 
-		possible_crtc[i] = c->possible_crtc;
-		crtc[c->crtc - drm->crtcs] = i;
 	}
 	assert(index != -1);
 
 	possible_crtc[index] = conn->possible_crtc;
-	match_obj(wl_list_length(&drm->outputs), possible_crtc, drm->num_crtcs,
-		crtc, crtc_res);
+	match_obj(wl_list_length(&drm->outputs), possible_crtc,
+		drm->num_crtcs, crtc, crtc_res);
 
-	bool matched = false;
+	bool matched[num_outputs];
+	memset(matched, false, sizeof(matched));
 	for (size_t i = 0; i < drm->num_crtcs; ++i) {
-		// We don't want any of the current monitors to be deactivated.
-		if (crtc[i] != UNMATCHED && crtc_res[i] == UNMATCHED) {
-			return;
-		}
-		if (crtc_res[i] == index) {
-			matched = true;
+		if (crtc_res[i] != UNMATCHED) {
+			matched[crtc_res[i]] = true;
 		}
 	}
 
 	// There is no point doing anything if this monitor doesn't get activated
-	if (!matched) {
+	if (!matched[index]) {
 		return;
 	}
 
+	for (size_t i = 0; i < drm->num_crtcs; ++i) {
+		// We don't want any of the current monitors to be deactivated.
+		if (crtc[i] != UNMATCHED && !matched[crtc[i]]) {
+			return;
+		}
+	}
+
 	changed_outputs[index] = true;
 
 	for (size_t i = 0; i < drm->num_crtcs; ++i) {
@@ -711,6 +718,9 @@ void wlr_drm_scan_connectors(struct wlr_drm_backend *drm) {
 			wlr_log_errno(L_ERROR, "Failed to get DRM connector");
 			continue;
 		}
+		drmModeEncoder *curr_enc = drmModeGetEncoder(drm->fd,
+			drm_conn->encoder_id);
+
 		int index = -1;
 		struct wlr_drm_connector *c, *wlr_conn = NULL;
 		wl_list_for_each(c, &drm->outputs, link) {
@@ -720,10 +730,12 @@ void wlr_drm_scan_connectors(struct wlr_drm_backend *drm) {
 				break;
 			}
 		}
+
 		if (!wlr_conn) {
 			wlr_conn = calloc(1, sizeof(*wlr_conn));
 			if (!wlr_conn) {
 				wlr_log_errno(L_ERROR, "Allocation failed");
+				drmModeFreeEncoder(curr_enc);
 				drmModeFreeConnector(drm_conn);
 				continue;
 			}
@@ -737,11 +749,8 @@ void wlr_drm_scan_connectors(struct wlr_drm_backend *drm) {
 			wlr_conn->state = WLR_DRM_CONN_DISCONNECTED;
 			wlr_conn->id = drm_conn->connector_id;
 
-			drmModeEncoder *curr_enc = drmModeGetEncoder(drm->fd,
-					drm_conn->encoder_id);
 			if (curr_enc) {
 				wlr_conn->old_crtc = drmModeGetCrtc(drm->fd, curr_enc->crtc_id);
-				drmModeFreeEncoder(curr_enc);
 			}
 
 			wlr_conn->output.phys_width = drm_conn->mmWidth;
@@ -767,6 +776,17 @@ void wlr_drm_scan_connectors(struct wlr_drm_backend *drm) {
 			seen[index] = true;
 		}
 
+		if (curr_enc) {
+			for (size_t i = 0; i < drm->num_crtcs; ++i) {
+				if (drm->crtcs[i].id == curr_enc->crtc_id) {
+					wlr_conn->crtc = &drm->crtcs[i];
+					break;
+				}
+			}
+		} else {
+			wlr_conn->crtc = NULL;
+		}
+
 		if (wlr_conn->state == WLR_DRM_CONN_DISCONNECTED &&
 				drm_conn->connection == DRM_MODE_CONNECTED) {
 
@@ -802,6 +822,7 @@ void wlr_drm_scan_connectors(struct wlr_drm_backend *drm) {
 			wlr_drm_connector_cleanup(wlr_conn);
 		}
 
+		drmModeFreeEncoder(curr_enc);
 		drmModeFreeConnector(drm_conn);
 	}