hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-11-02 03:45:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

backend/drm: make serial optional

Browse source 
The EDID 1.4 spec says that the serial number is optional:

> If this field is not used, then enter “00h, 00h, 00h, 00h”.

Leave the wlr_output.serial field NULL in that case, and hide it
from the output description.
This commit is contained in:
Simon Ser 2022-06-07 11:54:57 +02:00 committed by Isaac Freund
parent 1b27d537d1
commit 1f96f388e9
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
backend/drm/drm.c
View file

@ -1343,9 +1343,13 @@ void scan_drm_connectors(struct wlr_drm_backend *drm,
struct wlr_output *output = &wlr_conn->output; struct wlr_output *output = &wlr_conn->output;
char description[128]; char description[128];
snprintf(description, sizeof(description), "%s %s %s (%s%s%s)", snprintf(description, sizeof(description), "%s %s%s%s (%s%s%s)",
output->make, output->model, output->serial, output->name, output->make, output->model,
subconnector ? " via " : "", subconnector ? subconnector : ""); output->serial ? " " : "",
output->serial ? output->serial : "",
output->name,
subconnector ? " via " : "",
subconnector ? subconnector : "");
wlr_output_set_description(output, description); wlr_output_set_description(output, description);
free(subconnector); free(subconnector);

6
backend/drm/util.c
View file

@ -86,7 +86,11 @@ void parse_edid(struct wlr_drm_connector *conn, size_t len, const uint8_t *data)
uint32_t serial = data[12] | (data[13] << 8) | (data[14] << 8) | (data[15] << 8); uint32_t serial = data[12] | (data[13] << 8) | (data[14] << 8) | (data[15] << 8);
char serial_str[32]; char serial_str[32];
if (serial != 0) {
snprintf(serial_str, sizeof(serial_str), "0x%08" PRIX32, serial); snprintf(serial_str, sizeof(serial_str), "0x%08" PRIX32, serial);
} else {
serial_str[0] = '\0';
}
for (size_t i = 72; i <= 108; i += 18) { for (size_t i = 72; i <= 108; i += 18) {
uint16_t flag = (data[i] << 8) | data[i + 1]; uint16_t flag = (data[i] << 8) | data[i + 1];
@ -112,8 +116,10 @@ void parse_edid(struct wlr_drm_connector *conn, size_t len, const uint8_t *data)
} }
output->model = strdup(model_str); output->model = strdup(model_str);
if (output->serial[0] != '\0') {
output->serial = strdup(serial_str); output->serial = strdup(serial_str);
} }
}
const char *conn_get_name(uint32_t type_id) { const char *conn_get_name(uint32_t type_id) {
switch (type_id) { switch (type_id) {