3 files changed, 34 insertions, 23 deletions

diff --git a/backend/drm/drm.c b/backend/drm/drm.c
index f14e3bb0..14f1254f 100644
--- a/backend/drm/drm.c
+++ b/backend/drm/drm.c
@@ -991,36 +991,44 @@ static void realloc_crtcs(struct wlr_drm_backend *drm, bool *changed_outputs) {
 	}
 }
 
-static uint32_t get_possible_crtcs(int fd, uint32_t conn_id) {
-	drmModeConnector *conn = drmModeGetConnector(fd, conn_id);
-	if (!conn) {
-		wlr_log_errno(WLR_ERROR, "Failed to get DRM connector");
-		return 0;
-	}
+static uint32_t get_possible_crtcs(int fd, drmModeRes *res,
+		drmModeConnector *conn, bool is_mst) {
+	drmModeEncoder *enc;
+	uint32_t ret = 0;
 
-	if (conn->connection != DRM_MODE_CONNECTED || conn->count_modes == 0) {
-		wlr_log(WLR_ERROR, "Output is not connected");
-		goto error_conn;
-	}
-
-	drmModeEncoder *enc = NULL;
 	for (int i = 0; !enc && i < conn->count_encoders; ++i) {
 		enc = drmModeGetEncoder(fd, conn->encoders[i]);
+		if (!enc) {
+			continue;
+		}
+
+		ret |= enc->possible_crtcs;
+
+		drmModeFreeEncoder(enc);
+	}
+
+	// Sometimes DP MST connectors report no encoders, so we'll loop though
+	// all of the encoders of the MST type instead.
+	// TODO: See if there is a better solution.
+
+	if (!is_mst || ret) {
+		return ret;
 	}
 
-	if (!enc) {
-		wlr_log(WLR_ERROR, "Failed to get DRM encoder");
-		goto error_conn;
+	for (int i = 0; i < res->count_encoders; ++i) {
+		enc = drmModeGetEncoder(fd, res->encoders[i]);
+		if (!enc) {
+			continue;
+		}
+
+		if (enc->encoder_type == DRM_MODE_ENCODER_DPMST) {
+			ret |= enc->possible_crtcs;
+		}
+
+		drmModeFreeEncoder(enc);
 	}
 
-	uint32_t ret = enc->possible_crtcs;
-	drmModeFreeEncoder(enc);
-	drmModeFreeConnector(conn);
 	return ret;
-
-error_conn:
-	drmModeFreeConnector(conn);
-	return 0;
 }
 
 void scan_drm_connectors(struct wlr_drm_backend *drm) {
@@ -1167,7 +1175,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, wlr_conn->id);
+			wlr_conn->possible_crtc = get_possible_crtcs(drm->fd, res, drm_conn,
+				wlr_conn->props.path != 0);
 			if (wlr_conn->possible_crtc == 0) {
 				wlr_log(WLR_ERROR, "No CRTC possible for connector '%s'",
 					wlr_conn->output.name);
diff --git a/backend/drm/properties.c b/backend/drm/properties.c
index 5ca4c8ac..5541d1be 100644
--- a/backend/drm/properties.c
+++ b/backend/drm/properties.c
@@ -22,6 +22,7 @@ static const struct prop_info connector_info[] = {
 	{ "CRTC_ID",     INDEX(crtc_id) },
 	{ "DPMS",        INDEX(dpms) },
 	{ "EDID",        INDEX(edid) },
+	{ "PATH",        INDEX(path) },
 	{ "link-status", INDEX(link_status) },
 #undef INDEX
 };
diff --git a/include/backend/drm/properties.h b/include/backend/drm/properties.h
index 321b4492..b4d43bdd 100644
--- a/include/backend/drm/properties.h
+++ b/include/backend/drm/properties.h
@@ -15,6 +15,7 @@ union wlr_drm_connector_props {
 		uint32_t edid;
 		uint32_t dpms;
 		uint32_t link_status; // not guaranteed to exist
+		uint32_t path;
 
 		// atomic-modesetting only