Commit 4966b2a9 authored by Christian Schmidt's avatar Christian Schmidt Committed by Dave Airlie

Fix wrong assumptions in cea_for_each_detailed_block v2

The current logic misunderstands the spec about CEA 18byte descriptors.
First, the spec doesn't state "detailed timing descriptors" but "18 byte
descriptors", so any data record could be stored, mixed timings and
other data, just as in the standard EDID.
Second, the lower four bit of byte 3 of the CEA record do not contain
the number of descriptors, but "the total number of DTDs defining native
formats in the whole EDID [...], starting with the first DTD in the DTD
list (which starts in the base EDID block)." A device can of course
support non-native formats.

As such the number can't be used to determine n, and the existing code
will filter non-timing 18byte descriptors anyway.
Signed-off-by: default avatarChristian Schmidt <schmidt@digadd.de>
Reviewed-by: default avatarAdam Jackson <ajax@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent a0ab734d
...@@ -508,25 +508,10 @@ static void ...@@ -508,25 +508,10 @@ static void
cea_for_each_detailed_block(u8 *ext, detailed_cb *cb, void *closure) cea_for_each_detailed_block(u8 *ext, detailed_cb *cb, void *closure)
{ {
int i, n = 0; int i, n = 0;
u8 rev = ext[0x01], d = ext[0x02]; u8 d = ext[0x02];
u8 *det_base = ext + d; u8 *det_base = ext + d;
switch (rev) { n = (127 - d) / 18;
case 0:
/* can't happen */
return;
case 1:
/* have to infer how many blocks we have, check pixel clock */
for (i = 0; i < 6; i++)
if (det_base[18*i] || det_base[18*i+1])
n++;
break;
default:
/* explicit count */
n = min(ext[0x03] & 0x0f, 6);
break;
}
for (i = 0; i < n; i++) for (i = 0; i < n; i++)
cb((struct detailed_timing *)(det_base + 18 * i), closure); cb((struct detailed_timing *)(det_base + 18 * i), closure);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment