edid: add support for standard timings descriptor

Signed-off-by: Simon Ser <contact@emersion.fr>
This commit is contained in:
Simon Ser committed 2022-08-29 11:54:48 +00:00
1 parent 1911c0be81
commit 93b0fd18de
4 files changed
+86 -2

No files matched your search

+10
View File
@@ -348,6 +348,8 @@ print_display_desc(const struct di_edid *edid,
const char *tag_name, *str;
const struct di_edid_display_range_limits *range_limits;
enum di_edid_display_range_limits_type range_limits_type;
const struct di_edid_standard_timing *const *standard_timings;
size_t i;
tag = di_edid_display_descriptor_get_tag(desc);
tag_name = display_desc_tag_name(tag);
@@ -383,6 +385,14 @@ print_display_desc(const struct di_edid *edid,
range_limits->max_pixel_clock_hz / (1000 * 1000));
}
break;
case DI_EDID_DISPLAY_DESCRIPTOR_STD_TIMING_IDS:
standard_timings = di_edid_display_descriptor_get_standard_timings(desc);
for (i = 0; standard_timings[i] != NULL; i++) {
printf(" ");
print_standard_timing(standard_timings[i]);
}
break;
default:
break; /* TODO: print other tags */
}
+57 -2
View File
@@ -600,6 +600,30 @@ parse_display_range_limits(struct di_edid *edid,
return true;
}
static bool
parse_standard_timings_descriptor(struct di_edid *edid,
const uint8_t data[static EDID_BYTE_DESCRIPTOR_SIZE],
struct di_edid_display_descriptor *desc)
{
struct di_edid_standard_timing *t;
size_t i;
const uint8_t *timing_data;
for (i = 0; i < EDID_MAX_DESCRIPTOR_STANDARD_TIMING_COUNT; i++) {
timing_data = &data[5 + i * EDID_STANDARD_TIMING_SIZE];
if (!parse_standard_timing(edid, timing_data, &t))
return false;
if (t)
desc->standard_timings[desc->standard_timings_len++] = t;
}
if (data[17] != 0x0A)
add_failure_until(edid, 4,
"Standard Timing Identifications: Last byte must be a line feed.");
return true;
}
static bool
parse_byte_descriptor(struct di_edid *edid,
const uint8_t data[static EDID_BYTE_DESCRIPTOR_SIZE])
@@ -656,8 +680,13 @@ parse_byte_descriptor(struct di_edid *edid,
return true;
}
break;
case DI_EDID_DISPLAY_DESCRIPTOR_COLOR_POINT:
case DI_EDID_DISPLAY_DESCRIPTOR_STD_TIMING_IDS:
if (!parse_standard_timings_descriptor(edid, data, desc)) {
free(desc);
return false;
}
break;
case DI_EDID_DISPLAY_DESCRIPTOR_COLOR_POINT:
case DI_EDID_DISPLAY_DESCRIPTOR_DCM_DATA:
case DI_EDID_DISPLAY_DESCRIPTOR_CVT_TIMING_CODES:
case DI_EDID_DISPLAY_DESCRIPTOR_ESTABLISHED_TIMINGS_III:
@@ -827,6 +856,23 @@ _di_edid_parse(const void *data, size_t size, FILE *failure_msg_file)
return edid;
}
static void
destroy_display_descriptor(struct di_edid_display_descriptor *desc)
{
size_t i;
switch (desc->tag) {
case DI_EDID_DISPLAY_DESCRIPTOR_STD_TIMING_IDS:
for (i = 0; i < desc->standard_timings_len; i++) {
free(desc->standard_timings[i]);
}
break;
default:
break; /* Nothing to do */
}
free(desc);
}
void
_di_edid_destroy(struct di_edid *edid)
{
@@ -842,7 +888,7 @@ _di_edid_destroy(struct di_edid *edid)
}
for (i = 0; i < edid->display_descriptors_len; i++) {
free(edid->display_descriptors[i]);
destroy_display_descriptor(edid->display_descriptors[i]);
}
for (i = 0; edid->exts[i] != NULL; i++) {
@@ -1025,6 +1071,15 @@ di_edid_display_descriptor_get_range_limits(const struct di_edid_display_descrip
return &desc->range_limits;
}
const struct di_edid_standard_timing *const *
di_edid_display_descriptor_get_standard_timings(const struct di_edid_display_descriptor *desc)
{
if (desc->tag != DI_EDID_DISPLAY_DESCRIPTOR_STD_TIMING_IDS) {
return NULL;
}
return (const struct di_edid_standard_timing *const *) desc->standard_timings;
}
const struct di_edid_ext *const *
di_edid_get_extensions(const struct di_edid *edid)
{
+8
View File
@@ -30,6 +30,11 @@
* The size of an EDID byte descriptor, defined in section 3.10.
*/
#define EDID_BYTE_DESCRIPTOR_SIZE 18
/**
* The maximum number of standard timings in an EDID display descriptor, defined
* in section 3.10.3.6.
*/
#define EDID_MAX_DESCRIPTOR_STANDARD_TIMING_COUNT 6
struct di_edid {
struct di_edid_vendor_product vendor_product;
@@ -74,6 +79,9 @@ struct di_edid_display_descriptor {
char str[14];
/* Used for RANGE_LIMITS */
struct di_edid_display_range_limits range_limits;
/* Used for STD_TIMING_IDS, NULL-terminated */
struct di_edid_standard_timing *standard_timings[EDID_MAX_DESCRIPTOR_STANDARD_TIMING_COUNT + 1];
size_t standard_timings_len;
};
struct di_edid_ext {
+11
View File
@@ -563,6 +563,17 @@ struct di_edid_display_range_limits {
const struct di_edid_display_range_limits *
di_edid_display_descriptor_get_range_limits(const struct di_edid_display_descriptor *desc);
/**
* Get a standard timing list from an EDID display descriptor.
*
* The returned array is NULL-terminated.
*
* Returns NULL if the display descriptor tag isn't
* DI_EDID_DISPLAY_DESCRIPTOR_STD_TIMING_IDS.
*/
const struct di_edid_standard_timing *const *
di_edid_display_descriptor_get_standard_timings(const struct di_edid_display_descriptor *desc);
/**
* Get a list of EDID extensions.
*