diff options
| author | Tomas Bzatek <tomas@bzatek.net> | 2016-05-01 15:02:45 +0200 |
|---|---|---|
| committer | Abhinav Kumar <abhinavk@codeaurora.org> | 2017-04-06 20:35:44 -0700 |
| commit | a45e2639921048ba4750f18b7303e7c62842ee5a (patch) | |
| tree | ff01ae8976ed31c20b9ebb723ea2391ba7a09a8a | |
| parent | 9695df13df85f42d2cdea1c493bfe656f9b28ccf (diff) | |
drm/displayid: Iterate over all DisplayID blocks
This will iterate over all DisplayID blocks found in the buffer.
Previously only the first block was parsed.
https://bugs.freedesktop.org/show_bug.cgi?id=95207
Change-Id: Ida0480aa1652d3725a02950df83c3602fce8bb6e
Signed-off-by: Tomas Bzatek <tomas@bzatek.net>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Git-commit: 3a4a2ea39f86c581054794c0a727597745f1084b
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
| -rw-r--r-- | drivers/gpu/drm/drm_edid.c | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 909f560016ad..4679c7dd6e1b 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -4128,19 +4128,27 @@ static int drm_parse_display_id(struct drm_connector *connector, if (ret) return ret; - block = (struct displayid_block *)&displayid[idx + 4]; - DRM_DEBUG_KMS("block id %d, rev %d, len %d\n", - block->tag, block->rev, block->num_bytes); - - switch (block->tag) { - case DATA_BLOCK_TILED_DISPLAY: - ret = drm_parse_tiled_block(connector, block); - if (ret) - return ret; - break; - default: - printk("unknown displayid tag %d\n", block->tag); - break; + idx += sizeof(struct displayid_hdr); + while (block = (struct displayid_block *)&displayid[idx], + idx + sizeof(struct displayid_block) <= length && + idx + sizeof(struct displayid_block) + + block->num_bytes <= length && + block->num_bytes > 0) { + idx += block->num_bytes + sizeof(struct displayid_block); + DRM_DEBUG_KMS("block id 0x%x, rev %d, len %d\n", + block->tag, block->rev, block->num_bytes); + + switch (block->tag) { + case DATA_BLOCK_TILED_DISPLAY: + ret = drm_parse_tiled_block(connector, block); + if (ret) + return ret; + break; + default: + DRM_DEBUG_KMS("found DisplayID tag 0x%x, unhandled\n", + block->tag); + break; + } } return 0; } |