mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

backend-drm: init dhi in drm_head_info_from_edid() 

Instead of initializing dhi in update_head_from_connector(), let
drm_head_info_from_edid() always init that, even when it fails to parse
EDID data.

Signed-off-by: Leandro Ribeiro <leandro.ribeiro@collabora.com>
This commit is contained in:
Leandro Ribeiro 2024-07-17 17:02:34 -03:00 committed by Daniel Stone
parent 95c3f96870
commit f23e511ec7
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libweston/backend-drm/modes.c
View File

@ -236,8 +236,12 @@ drm_head_info_from_edid(struct drm_head_info *dhi,
const char *msg;
di_ctx = di_info_parse_edid(data, length);
if (!di_ctx)
if (!di_ctx) {
memset(dhi, 0, sizeof(*dhi));
dhi->eotf_mask = WESTON_EOTF_MODE_SDR;
dhi->colorimetry_mask = WESTON_COLORIMETRY_MODE_DEFAULT;
return;
}
msg = di_info_get_failure_msg(di_ctx);
if (msg)
@ -533,7 +537,7 @@ update_head_from_connector(struct drm_head *head)
if (!drm_head_maybe_update_display_data(head, props))
return;
struct drm_head_info dhi = { .eotf_mask = WESTON_EOTF_MODE_SDR };
struct drm_head_info dhi;
drm_head_info_from_edid(&dhi, head->display_data, head->display_data_len);