aboutsummaryrefslogtreecommitdiff
path: root/backend
diff options
context:
space:
mode:
Diffstat (limited to 'backend')
-rw-r--r--backend/drm/drm.c17
-rw-r--r--backend/drm/properties.c26
2 files changed, 41 insertions, 2 deletions
diff --git a/backend/drm/drm.c b/backend/drm/drm.c
index a045bd53..0bf51209 100644
--- a/backend/drm/drm.c
+++ b/backend/drm/drm.c
@@ -1349,12 +1349,25 @@ void scan_drm_connectors(struct wlr_drm_backend *drm) {
parse_edid(&wlr_conn->output, edid_len, edid);
free(edid);
+ char *subconnector = NULL;
+ if (wlr_conn->props.subconnector) {
+ subconnector = get_drm_prop_enum(drm->fd,
+ wlr_conn->id, wlr_conn->props.subconnector);
+ }
+ if (subconnector && strcmp(subconnector, "Native") == 0) {
+ free(subconnector);
+ subconnector = NULL;
+ }
+
struct wlr_output *output = &wlr_conn->output;
char description[128];
- snprintf(description, sizeof(description), "%s %s %s (%s)",
- output->make, output->model, output->serial, output->name);
+ snprintf(description, sizeof(description), "%s %s %s (%s%s%s)",
+ output->make, output->model, output->serial, output->name,
+ subconnector ? " via " : "", subconnector ? subconnector : "");
wlr_output_set_description(output, description);
+ free(subconnector);
+
wlr_log(WLR_INFO, "Detected modes:");
for (int i = 0; i < drm_conn->count_modes; ++i) {
diff --git a/backend/drm/properties.c b/backend/drm/properties.c
index de51a3de..5581a130 100644
--- a/backend/drm/properties.c
+++ b/backend/drm/properties.c
@@ -1,3 +1,4 @@
+#define _POSIX_C_SOURCE 200809L
#include <stdbool.h>
#include <stddef.h>
#include <stdint.h>
@@ -24,6 +25,7 @@ static const struct prop_info connector_info[] = {
{ "EDID", INDEX(edid) },
{ "PATH", INDEX(path) },
{ "link-status", INDEX(link_status) },
+ { "subconnector", INDEX(subconnector) },
{ "vrr_capable", INDEX(vrr_capable) },
#undef INDEX
};
@@ -151,3 +153,27 @@ void *get_drm_prop_blob(int fd, uint32_t obj, uint32_t prop, size_t *ret_len) {
drmModeFreePropertyBlob(blob);
return ptr;
}
+
+char *get_drm_prop_enum(int fd, uint32_t obj, uint32_t prop_id) {
+ uint64_t value;
+ if (!get_drm_prop(fd, obj, prop_id, &value)) {
+ return NULL;
+ }
+
+ drmModePropertyRes *prop = drmModeGetProperty(fd, prop_id);
+ if (!prop) {
+ return NULL;
+ }
+
+ char *str = NULL;
+ for (int i = 0; i < prop->count_enums; i++) {
+ if (prop->enums[i].value == value) {
+ str = strdup(prop->enums[i].name);
+ break;
+ }
+ }
+
+ drmModeFreeProperty(prop);
+
+ return str;
+}