Merge "drm/displayid: Iterate over all DisplayID blocks" (f1283dac) · Commits · e / devices / android_kernel_sony_msm8998

drivers/gpu/drm/drm_edid.c

+21 −13

Original line number	Diff line number	Diff line
		@@ -4128,8 +4128,14 @@ 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",
		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) {
		@@ -4139,9 +4145,11 @@ 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;
		}