diff options
author | Simon Ser <simon.ser@intel.com> | 2019-07-19 14:36:14 +0300 |
---|---|---|
committer | Simon Ser <simon.ser@intel.com> | 2019-08-15 13:04:18 +0300 |
commit | 02b227b6b0ff968b997bfeffc14374c023f83394 (patch) | |
tree | 9686a85bbc7569f9df459d8db4c9f2860e7783a0 | |
parent | a092f546dae323a6b1e981501c4136a6b35afe92 (diff) | |
download | platform_external_igt-gpu-tools-02b227b6b0ff968b997bfeffc14374c023f83394.tar.gz platform_external_igt-gpu-tools-02b227b6b0ff968b997bfeffc14374c023f83394.tar.bz2 platform_external_igt-gpu-tools-02b227b6b0ff968b997bfeffc14374c023f83394.zip |
lib/igt_edid: merge edid_ext_update_cea_checksum into edid_update_checksum
Callers no longer need to call edid_ext_update_cea_checksum on each extension
block. This makes it less error-prone to miss one block by mistake.
Signed-off-by: Simon Ser <simon.ser@intel.com>
Reviewed-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
-rw-r--r-- | lib/igt_edid.c | 20 | ||||
-rw-r--r-- | lib/igt_edid.h | 1 | ||||
-rw-r--r-- | lib/igt_kms.c | 3 |
3 files changed, 13 insertions, 11 deletions
diff --git a/lib/igt_edid.c b/lib/igt_edid.c index 1ad88970..1c85486d 100644 --- a/lib/igt_edid.c +++ b/lib/igt_edid.c @@ -296,12 +296,24 @@ static uint8_t compute_checksum(const uint8_t *buf, size_t size) } /** - * edid_update_checksum: compute and update the EDID checksum + * edid_update_checksum: compute and update the checksums of the main EDID + * block and all extension blocks */ void edid_update_checksum(struct edid *edid) { + size_t i; + struct edid_ext *ext; + edid->checksum = compute_checksum((uint8_t *) edid, sizeof(struct edid)); + + for (i = 0; i < edid->extensions_len; i++) { + ext = &edid->extensions[i]; + if (ext->tag == EDID_EXT_CEA) + ext->data.cea.checksum = + compute_checksum((uint8_t *) ext, + sizeof(struct edid_ext)); + } } /** @@ -465,9 +477,3 @@ void edid_ext_set_cea(struct edid_ext *ext, size_t data_blocks_size, cea->dtd_start = 4 + data_blocks_size; cea->misc = flags | num_native_dtds; } - -void edid_ext_update_cea_checksum(struct edid_ext *ext) -{ - ext->data.cea.checksum = compute_checksum((uint8_t *) ext, - sizeof(struct edid_ext)); -} diff --git a/lib/igt_edid.h b/lib/igt_edid.h index d256b789..59b47a97 100644 --- a/lib/igt_edid.h +++ b/lib/igt_edid.h @@ -368,7 +368,6 @@ void detailed_timing_set_string(struct detailed_timing *dt, void cea_sad_init_pcm(struct cea_sad *sad, int channels, uint8_t sampling_rates, uint8_t sample_sizes); -void edid_ext_update_cea_checksum(struct edid_ext *ext); const struct cea_vsdb *cea_vsdb_get_hdmi_default(size_t *size); size_t edid_cea_data_block_set_sad(struct edid_cea_data_block *block, const struct cea_sad *sads, size_t sads_len); diff --git a/lib/igt_kms.c b/lib/igt_kms.c index 0a10bc60..cba309c8 100644 --- a/lib/igt_kms.c +++ b/lib/igt_kms.c @@ -205,7 +205,6 @@ generate_audio_edid(unsigned char raw_edid[static AUDIO_EDID_SIZE], edid_ext_set_cea(edid_ext, cea_data_size, 0, EDID_CEA_BASIC_AUDIO); edid_update_checksum(edid); - edid_ext_update_cea_checksum(edid_ext); return edid; } @@ -314,7 +313,6 @@ const struct edid *igt_kms_get_4k_edid(void) edid_ext_set_cea(edid_ext, cea_data_size, 0, 0); edid_update_checksum(edid); - edid_ext_update_cea_checksum(edid_ext); return edid; } @@ -366,7 +364,6 @@ const struct edid *igt_kms_get_3d_edid(void) edid_ext_set_cea(edid_ext, cea_data_size, 0, 0); edid_update_checksum(edid); - edid_ext_update_cea_checksum(edid_ext); return edid; } |