isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-13 11:54:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

monitor: Add getter for EDID MD5 checksum

Browse Source 
Will be used for colord device matching.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2141>
This commit is contained in:
Jonas Ådahl 2021-10-26 11:27:56 +02:00 committed by Marge Bot
parent 15bbded86b
commit 8446cd9f4f
4 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/backends/meta-monitor.c
View File

@ -473,6 +473,15 @@ meta_monitor_get_serial (MetaMonitor *monitor)
return output_info->serial; return output_info->serial;
} }
const char *
meta_monitor_get_edid_checksum_md5 (MetaMonitor *monitor)
{
const MetaOutputInfo *output_info =
meta_monitor_get_main_output_info (monitor);
return output_info->edid_checksum_md5;
}
MetaConnectorType MetaConnectorType
meta_monitor_get_connector_type (MetaMonitor *monitor) meta_monitor_get_connector_type (MetaMonitor *monitor)
{ {

2
src/backends/meta-monitor.h
View File

@ -155,6 +155,8 @@ const char * meta_monitor_get_product (MetaMonitor *monitor);
META_EXPORT_TEST META_EXPORT_TEST
const char * meta_monitor_get_serial (MetaMonitor *monitor); const char * meta_monitor_get_serial (MetaMonitor *monitor);
const char * meta_monitor_get_edid_checksum_md5 (MetaMonitor *monitor);
META_EXPORT_TEST META_EXPORT_TEST
MetaConnectorType meta_monitor_get_connector_type (MetaMonitor *monitor); MetaConnectorType meta_monitor_get_connector_type (MetaMonitor *monitor);

8
src/backends/meta-output.c
View File

@ -94,6 +94,7 @@ meta_output_info_unref (MetaOutputInfo *output_info)
g_free (output_info->vendor); g_free (output_info->vendor);
g_free (output_info->product); g_free (output_info->product);
g_free (output_info->serial); g_free (output_info->serial);
g_free (output_info->edid_checksum_md5);
g_free (output_info->modes); g_free (output_info->modes);
g_free (output_info->possible_crtcs); g_free (output_info->possible_crtcs);
g_free (output_info->possible_clones); g_free (output_info->possible_clones);
@ -310,11 +311,16 @@ meta_output_info_parse_edid (MetaOutputInfo *output_info,
{ {
MetaEdidInfo *parsed_edid; MetaEdidInfo *parsed_edid;
size_t len; size_t len;
gconstpointer data;
if (!edid) if (!edid)
goto out; goto out;
parsed_edid = meta_edid_info_new_parse (g_bytes_get_data (edid, &len)); data = g_bytes_get_data (edid, &len);
parsed_edid = meta_edid_info_new_parse (data);
output_info->edid_checksum_md5 = g_compute_checksum_for_data (G_CHECKSUM_MD5,
data, len);
if (parsed_edid) if (parsed_edid)
{ {

3
src/backends/meta-output.h
View File

@ -84,6 +84,9 @@ typedef struct _MetaOutputInfo
char *vendor; char *vendor;
char *product; char *product;
char *serial; char *serial;
char *edid_checksum_md5;
int width_mm; int width_mm;
int height_mm; int height_mm;
CoglSubpixelOrder subpixel_order; CoglSubpixelOrder subpixel_order;