Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a4a2ea3 authored by Tomas Bzatek's avatar Tomas Bzatek Committed by Dave Airlie
Browse files

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



Signed-off-by: default avatarTomas Bzatek <tomas@bzatek.net>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 5e546cd5

drivers/gpu/drm/drm_edid.c

+19 −13
Original line number Diff line number Diff line
@@ -4237,8 +4237,13 @@ static int drm_parse_display_id(struct drm_connector *connector, 
		return -EINVAL;

	}



	block = (struct displayid_block *)&displayid[idx + 4];

	DRM_DEBUG_KMS("block id %d, rev %d, len %d\n",

	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) {
@@ -4248,9 +4253,10 @@ static int drm_parse_display_id(struct drm_connector *connector, 
				return ret;

			break;

		default:

		printk("unknown displayid tag %d\n", block->tag);

			DRM_DEBUG_KMS("found DisplayID tag 0x%x, unhandled\n", block->tag);

			break;

		}

	}

	return 0;

}