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

backend-drm: expose display_info 

Update the field returned by weston_head_get_display_info(). This makes
EDID di_info available to frontends.

Since EDID data has changed, then head device_changed must be true as
well, because di_info may expose all EDID information and not just what
we track in the backend.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
This commit is contained in:
Pekka Paalanen 2023-08-31 14:28:07 +03:00 committed by Daniel Stone
parent 39b577e3a6
commit 77f72ce8f1
3 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libweston/backend-drm/drm-internal.h
View File

@ -669,6 +669,9 @@ drm_crtc_find(struct drm_device *device, uint32_t crtc_id);
struct drm_head *
drm_head_find_by_connector(struct drm_backend *backend, struct drm_device *device, uint32_t connector_id);
void
drm_free_display_info(struct di_info **display_info);
uint64_t
drm_rotation_from_output_transform(struct drm_plane *plane,
enum wl_output_transform ot);

1
libweston/backend-drm/drm.c
View File

@ -2774,6 +2774,7 @@ drm_head_destroy(struct weston_head *base)
assert(head);
drm_free_display_info(&head->base.display_info);
weston_head_release(&head->base);
drm_connector_fini(&head->connector);

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

@ -264,7 +264,7 @@ get_eotf_mask(const struct di_info *info)
#endif /* HAVE_LIBDISPLAY_INFO_HIGH_LEVEL_COLORIMETRY */
static void
static struct di_info *
drm_head_info_from_edid(struct drm_head_info *dhi,
const uint8_t *data,
size_t length)
@ -277,7 +277,7 @@ drm_head_info_from_edid(struct drm_head_info *dhi,
memset(dhi, 0, sizeof(*dhi));
dhi->eotf_mask = WESTON_EOTF_MODE_SDR;
dhi->colorimetry_mask = WESTON_COLORIMETRY_MODE_DEFAULT;
return;
return NULL;
}
msg = di_info_get_failure_msg(di_ctx);
@ -289,10 +289,20 @@ drm_head_info_from_edid(struct drm_head_info *dhi,
dhi->serial_number = di_info_get_serial(di_ctx);
dhi->eotf_mask = get_eotf_mask(di_ctx);
di_info_destroy(di_ctx);
/* TODO: parse this from EDID */
dhi->colorimetry_mask = WESTON_COLORIMETRY_MODE_ALL_MASK;
return di_ctx;
}
void
drm_free_display_info(struct di_info **display_info)
{
if (!*display_info)
return;
di_info_destroy(*display_info);
*display_info = NULL;
}
static void
@ -576,7 +586,10 @@ update_head_from_connector(struct drm_head *head)
struct drm_head_info dhi;
drm_head_info_from_edid(&dhi, head->display_data, head->display_data_len);
drm_free_display_info(&head->base.display_info);
head->base.display_info = drm_head_info_from_edid(&dhi, head->display_data,
head->display_data_len);
weston_head_set_device_changed(&head->base);
weston_head_set_monitor_strings(&head->base, dhi.make,
dhi.model,