From 9fe71e74e5cde74441ef70576653e9225fd0b34b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Kope=C4=87?= Date: Sat, 20 Feb 2021 13:06:50 +0100 Subject: [PATCH 1/2] Update documentation to reflect WLR_DRM_DEVICES separator change --- docs/env_vars.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/env_vars.md b/docs/env_vars.md index aa4635ccc..040fe0c85 100644 --- a/docs/env_vars.md +++ b/docs/env_vars.md @@ -14,7 +14,7 @@ wlroots reads these environment variables ## DRM backend -* *WLR_DRM_DEVICES*: specifies the DRM devices (as a colon separated list) +* *WLR_DRM_DEVICES*: specifies the DRM devices (as a comma separated list) instead of auto probing them. The first existing device in this list is considered the primary DRM device. * *WLR_DRM_NO_ATOMIC*: set to 1 to use legacy DRM interface instead of atomic From 770557871383851774404005bc9600c2f22ef072 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Kope=C4=87?= Date: Sat, 20 Feb 2021 13:06:58 +0100 Subject: [PATCH 2/2] Change WLR_DRM_DEVICES separator to comma --- backend/session/session.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/session/session.c b/backend/session/session.c index a076543a3..fce63c2ed 100644 --- a/backend/session/session.c +++ b/backend/session/session.c @@ -288,7 +288,7 @@ static ssize_t explicit_find_gpus(struct wlr_session *session, size_t i = 0; char *save; - char *ptr = strtok_r(gpus, ":", &save); + char *ptr = strtok_r(gpus, ",", &save); do { if (i >= ret_len) { break; @@ -300,7 +300,7 @@ static ssize_t explicit_find_gpus(struct wlr_session *session, } else { ++i; } - } while ((ptr = strtok_r(NULL, ":", &save))); + } while ((ptr = strtok_r(NULL, ",", &save))); free(gpus); return i;