evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "drm/displayid: Iterate over all DisplayID blocks"

Browse source
This commit is contained in:
Linux Build Service Account 2017-04-11 02:34:25 -07:00 • committed by Gerrit - the friendly Code Review server
commit f1283dace8
1 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
drivers/gpu/drm/drm_edid.c
View file

@ -4128,19 +4128,27 @@ static int drm_parse_display_id(struct drm_connector *connector,
if (ret) if (ret)
return ret; return ret;
block = (struct displayid_block *)&displayid[idx + 4]; idx += sizeof(struct displayid_hdr);
DRM_DEBUG_KMS("block id %d, rev %d, len %d\n", while (block = (struct displayid_block *)&displayid[idx],
block->tag, block->rev, block->num_bytes); 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) { switch (block->tag) {
case DATA_BLOCK_TILED_DISPLAY: case DATA_BLOCK_TILED_DISPLAY:
ret = drm_parse_tiled_block(connector, block); ret = drm_parse_tiled_block(connector, block);
if (ret) if (ret)
return ret; return ret;
break; break;
default: default:
printk("unknown displayid tag %d\n", block->tag); DRM_DEBUG_KMS("found DisplayID tag 0x%x, unhandled\n",
break; block->tag);
break;
}
} }
return 0; return 0;
} }