From 8bc5a92a98ca5b788cd4f426ad2605da265ef422 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Mon, 30 Nov 2020 16:19:01 +0100 Subject: Revert "backend/drm: stop force-probing connectors" This reverts commit 713c1661b742f93a7d2167321837c0d99541ca87. It turns out we do need to force-probe on startup and on hotplug [1]. This is unfortunate, but that's just how the uAPI works. Fixing this would require patching the kernel. [1]: https://lists.freedesktop.org/archives/dri-devel/2020-November/289506.html Closes: https://github.com/swaywm/wlroots/issues/2499 --- backend/drm/drm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'backend') diff --git a/backend/drm/drm.c b/backend/drm/drm.c index de505376..f797dd5a 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -1282,8 +1282,8 @@ void scan_drm_connectors(struct wlr_drm_backend *drm) { struct wlr_drm_connector *new_outputs[res->count_connectors + 1]; for (int i = 0; i < res->count_connectors; ++i) { - drmModeConnector *drm_conn = - drmModeGetConnectorCurrent(drm->fd, res->connectors[i]); + drmModeConnector *drm_conn = drmModeGetConnector(drm->fd, + res->connectors[i]); if (!drm_conn) { wlr_log_errno(WLR_ERROR, "Failed to get DRM connector"); continue; -- cgit v1.2.3