Re: [PATCH 2/4 v2] fbdev: export fb_edid_add_monspecs() for modules, improve algorithm
flat view
From: Paul Mundt <hidden>
Date: 2010-11-10 04:34:26
Also in:
linux-sh
On Tue, Nov 02, 2010 at 11:47:36AM +0100, Guennadi Liakhovetski wrote:
quoted hunk ↗ jump to hunk
diff --git a/drivers/video/fbmon.c b/drivers/video/fbmon.c index a0b5a93..38b3c30 100644 --- a/drivers/video/fbmon.c +++ b/drivers/video/fbmon.c@@ -973,58 +973,56 @@ void fb_edid_to_monspecs(unsigned char *edid, struct fb_monspecs *specs) DPRINTK("====================\n"); } +/** + * fb_edid_add_monspecs() - add monitor video modes from E-EDID data + * @edid: 128 byte array with an E-EDID block + * @spacs: monitor specs to be extended + */ void fb_edid_add_monspecs(unsigned char *edid, struct fb_monspecs *specs) {
...
+ u8 edt[(128 - 4) / DETAILED_TIMING_DESCRIPTION_SIZE];
...
quoted hunk ↗ jump to hunk
- if (edid[0] != 0x2) + if (edid[0] != 0x2 || + edid[2] < 4 || edid[2] > 128 - DETAILED_TIMING_DESCRIPTION_SIZE) return;
...
+ block = edid + edid[2];
...
quoted hunk ↗ jump to hunk
+ for (i = 0; i < (128 - edid[2]) / DETAILED_TIMING_DESCRIPTION_SIZE; + i++, block += DETAILED_TIMING_DESCRIPTION_SIZE) + if (!(block[0] = 0x00 && block[1] = 0x00)) + edt[num++] = block - edid;
Can we also do something about these magic numbers? There is already a drivers/video/edid.h that you can fill out as necessary. I realize that these values are probably pretty obvious if you have a copy of the spec in front of you, I don't.