Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 196430
b: refs/heads/master
c: 59d8aff
h: refs/heads/master
v: v3
  • Loading branch information
Adam Jackson authored and Dave Airlie committed Apr 6, 2010
1 parent dc2754c commit 8788312
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 15 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7466f4cc508878a8328dff1c328a2b4108888d2e
refs/heads/master: 59d8aff6e4fc2705053e7ce2948b51f7fe507536
17 changes: 3 additions & 14 deletions trunk/drivers/gpu/drm/drm_edid.c
Original file line number Diff line number Diff line change
Expand Up @@ -1328,31 +1328,20 @@ static int add_detailed_info_eedid(struct drm_connector *connector,
int start_offset, end_offset;
int timing_level;

if (edid->version == 1 && edid->revision < 3) {
/* If the EDID version is less than 1.3, there is no
* extension EDID.
*/
if (edid->version == 1 && edid->revision < 3)
return 0;
}
if (!edid->extensions) {
/* if there is no extension EDID, it is unnecessary to
* parse the E-EDID to get detailed info
*/
if (!edid->extensions)
return 0;
}

/* Find CEA extension */
for (i = 0; i < edid->extensions; i++) {
edid_ext = (char *)edid + EDID_LENGTH * (i + 1);
/* This block is CEA extension */
if (edid_ext[0] == 0x02)
break;
}

if (i == edid->extensions) {
/* if there is no additional timing EDID block, return */
if (i == edid->extensions)
return 0;
}

/* Get the start offset of detailed timing block */
start_offset = edid_ext[2];
Expand Down

0 comments on commit 8788312

Please sign in to comment.