Miroirs/libdisplay-info
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/emersion/libdisplay-info.git synced 2024-11-16 19:48:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

displayid: Add support for Type II Detailed Timing Data Block

Browse source 
Signed-off-by: Sebastian Wick <sebastian.wick@redhat.com>
This commit is contained in:
Sebastian Wick 2023-01-17 23:36:25 +01:00 committed by Sebastian Wick
parent bedd81f1b6
commit 4f1a7ca5a0
3 changed files with 133 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

112
displayid.c
View file

@ -24,6 +24,10 @@
* The size of a DisplayID type I timing.
*/
#define DISPLAYID_TYPE_I_TIMING_SIZE 20
/**
* The size of a DisplayID type II timing.
*/
#define DISPLAYID_TYPE_II_TIMING_SIZE 11
static bool
is_all_zeroes(const uint8_t *data, size_t size)
@ -237,6 +241,96 @@ parse_type_i_timing_block(struct di_displayid *displayid,
return true;
}
static bool
parse_type_ii_timing(struct di_displayid *displayid,
struct di_displayid_data_block *data_block,
const uint8_t data[static DISPLAYID_TYPE_II_TIMING_SIZE])
{
int raw_pixel_clock;
uint8_t stereo_3d;
struct di_displayid_type_i_ii_vii_timing *t = calloc(1, sizeof(*t));
if (t == NULL) {
return false;
}
t->aspect_ratio = DI_DISPLAYID_TYPE_I_II_VII_TIMING_ASPECT_RATIO_UNDEFINED;
raw_pixel_clock = data[0] | (data[1] << 8) | (data[2] << 16);
t->pixel_clock_mhz = (double)(1 + raw_pixel_clock) * 0.01;
t->preferred = has_bit(data[3], 7);
t->interlaced = has_bit(data[3], 4);
stereo_3d = get_bit_range(data[3], 6, 5);
switch (stereo_3d) {
case DI_DISPLAYID_TYPE_I_II_VII_TIMING_STEREO_3D_NEVER:
case DI_DISPLAYID_TYPE_I_II_VII_TIMING_STEREO_3D_ALWAYS:
case DI_DISPLAYID_TYPE_I_II_VII_TIMING_STEREO_3D_USER:
t->stereo_3d = stereo_3d;
break;
default:
add_failure(displayid,
"Video Timing Modes Type 2 - Detailed Timings Data Block: Reserved stereo 0x%02x.",
stereo_3d);
break;
}
t->horiz_sync_polarity = has_bit(data[3], 3);
t->vert_sync_polarity = has_bit(data[3], 2);
if (get_bit_range(data[3], 1, 0) != 0) {
add_failure(displayid,
"Video Timing Modes Type 2 - Detailed Timings Data Block: "
"Timing Options bit 1-0 are reserved.");
}
t->horiz_active = 8 + 8 * (data[4] | (get_bit_range(data[5], 0, 0) << 8));
t->horiz_blank = 8 + 8 * get_bit_range(data[5], 7, 1);
t->horiz_offset = 8 + 8 * get_bit_range(data[6], 7, 4);
t->horiz_sync_width = 8 + 8 * get_bit_range(data[6], 3, 0);
t->vert_active = 1 + (data[7] | (get_bit_range(data[8], 3, 0) << 8));
if (get_bit_range(data[8], 7, 4) != 0) {
add_failure(displayid,
"Video Timing Modes Type 2 - Detailed Timings Data Block: "
"Vertical Active Image bits 7-4 are reserved.");
}
t->vert_blank = 1 + data[9];
t->vert_offset = 1 + get_bit_range(data[9], 7, 4);
t->vert_sync_width = 1 + get_bit_range(data[9], 3, 0);
assert(data_block->type_ii_timings_len < DISPLAYID_MAX_TYPE_II_TIMINGS);
data_block->type_ii_timings[data_block->type_ii_timings_len++] = t;
return true;
}
static bool
parse_type_ii_timing_block(struct di_displayid *displayid,
struct di_displayid_data_block *data_block,
const uint8_t *data, size_t size)
{
size_t i;
check_data_block_revision(displayid, data,
"Video Timing Modes Type 2 - Detailed Timings Data Block",
0);
if ((size - DISPLAYID_DATA_BLOCK_HEADER_SIZE) % DISPLAYID_TYPE_II_TIMING_SIZE != 0) {
add_failure(displayid,
"Video Timing Modes Type 2 - Detailed Timings Data Block: payload size not divisible by element size.");
}
for (i = DISPLAYID_DATA_BLOCK_HEADER_SIZE;
i + DISPLAYID_TYPE_II_TIMING_SIZE <= size;
i += DISPLAYID_TYPE_II_TIMING_SIZE) {
if (!parse_type_ii_timing(displayid, data_block, &data[i])) {
return false;
}
}
return true;
}
static bool
parse_tiled_topo_block(struct di_displayid *displayid,
struct di_displayid_tiled_topo_priv *priv,
@ -373,9 +467,12 @@ parse_data_block(struct di_displayid *displayid, const uint8_t *data,
data_block_size))
goto skip;
break;
case DI_DISPLAYID_DATA_BLOCK_TYPE_II_TIMING:
if (!parse_type_ii_timing_block(displayid, data_block, data, data_block_size))
goto error;
break;
case DI_DISPLAYID_DATA_BLOCK_PRODUCT_ID:
case DI_DISPLAYID_DATA_BLOCK_COLOR_CHARACT:
case DI_DISPLAYID_DATA_BLOCK_TYPE_II_TIMING:
case DI_DISPLAYID_DATA_BLOCK_TYPE_III_TIMING:
case DI_DISPLAYID_DATA_BLOCK_TYPE_IV_TIMING:
case DI_DISPLAYID_DATA_BLOCK_VESA_TIMING:
@ -521,6 +618,10 @@ destroy_data_block(struct di_displayid_data_block *data_block)
for (i = 0; i < data_block->type_i_timings_len; i++)
free(data_block->type_i_timings[i]);
break;
case DI_DISPLAYID_DATA_BLOCK_TYPE_II_TIMING:
for (i = 0; i < data_block->type_ii_timings_len; i++)
free(data_block->type_ii_timings[i]);
break;
default:
break; /* Nothing to do */
}
@ -579,6 +680,15 @@ di_displayid_data_block_get_type_i_timings(const struct di_displayid_data_block
return (const struct di_displayid_type_i_ii_vii_timing *const *) data_block->type_i_timings;
}
const struct di_displayid_type_i_ii_vii_timing *const *
di_displayid_data_block_get_type_ii_timings(const struct di_displayid_data_block *data_block)
{
if (data_block->tag != DI_DISPLAYID_DATA_BLOCK_TYPE_II_TIMING) {
return NULL;
}
return (const struct di_displayid_type_i_ii_vii_timing *const *) data_block->type_ii_timings;
}
const struct di_displayid_tiled_topo *
di_displayid_data_block_get_tiled_topo(const struct di_displayid_data_block *data_block)
{

11
include/displayid.h
View file

@ -27,6 +27,13 @@
* I timing takes up 20 bytes.
*/
#define DISPLAYID_MAX_TYPE_I_TIMINGS 12
/**
* The maximum number of type II timings in a data block.
*
* A DisplayID data block has a maximum payload size of 248 bytes, and each type
* I timing takes up 11 bytes.
*/
#define DISPLAYID_MAX_TYPE_II_TIMINGS 22
struct di_displayid {
int version, revision;
@ -56,6 +63,10 @@ struct di_displayid_data_block {
struct di_displayid_type_i_ii_vii_timing *type_i_timings[DISPLAYID_MAX_TYPE_I_TIMINGS + 1];
size_t type_i_timings_len;
/* Used for TYPE_II_TIMING, NULL-terminated */
struct di_displayid_type_i_ii_vii_timing *type_ii_timings[DISPLAYID_MAX_TYPE_II_TIMINGS + 1];
size_t type_ii_timings_len;
/* Used for DISPLAY_PARAMS */
struct di_displayid_display_params_priv display_params;

11
include/libdisplay-info/displayid.h
View file

@ -219,6 +219,17 @@ struct di_displayid_type_i_ii_vii_timing {
const struct di_displayid_type_i_ii_vii_timing *const *
di_displayid_data_block_get_type_i_timings(const struct di_displayid_data_block *data_block);
/**
* Get type II timings from a DisplayID data block.
*
* The returned array is NULL-terminated.
*
* Returns NULL if the data block tag isn't
* DI_DISPLAYID_DATA_BLOCK_TYPE_II_TIMING.
*/
const struct di_displayid_type_i_ii_vii_timing *const *
di_displayid_data_block_get_type_ii_timings(const struct di_displayid_data_block *data_block);
/**
* Behavior when more than 1 tile and less than total number of tiles are driven
* by the source.