Skip to content

Commit

Permalink
video: add fb_edid_add_monspecs for parsing extended edid information
Browse files Browse the repository at this point in the history
Modern monitors/tvs have more extended EDID information blocks which can
contain extra detailed modes.  This adds a fb_edid_add_monspecs function
which drivers can use to parse those additions blocks.

Signed-off-by: Erik Gilling <konkers@android.com>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
Erik Gilling authored and Paul Mundt committed Nov 15, 2010
1 parent a7bcf21 commit 9fbbdde
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 0 deletions.
57 changes: 57 additions & 0 deletions drivers/video/fbmon.c
Original file line number Diff line number Diff line change
Expand Up @@ -973,6 +973,63 @@ void fb_edid_to_monspecs(unsigned char *edid, struct fb_monspecs *specs)
DPRINTK("========================================\n");
}

void fb_edid_add_monspecs(unsigned char *edid, struct fb_monspecs *specs)
{
unsigned char *block;
struct fb_videomode *mode, *m;
int num = 0, i, first = 1;

if (edid == NULL)
return;

if (!edid_checksum(edid))
return;

if (edid[0] != 0x2)
return;

mode = kzalloc(50 * sizeof(struct fb_videomode), GFP_KERNEL);
if (mode == NULL)
return;

block = edid + edid[0x2];

DPRINTK(" Extended Detailed Timings\n");

for (i = 0; i < (128 - edid[0x2]) / DETAILED_TIMING_DESCRIPTION_SIZE;
i++, block += DETAILED_TIMING_DESCRIPTION_SIZE) {
if (!(block[0] == 0x00 && block[1] == 0x00)) {
get_detailed_timing(block, &mode[num]);
if (first) {
mode[num].flag |= FB_MODE_IS_FIRST;
first = 0;
}
num++;
}
}

/* Yikes, EDID data is totally useless */
if (!num) {
kfree(mode);
return;
}

m = kzalloc((specs->modedb_len + num) *
sizeof(struct fb_videomode), GFP_KERNEL);

if (!m) {
kfree(mode);
return;
}

memmove(m, specs->modedb, specs->modedb_len * sizeof(struct fb_videomode));
memmove(m + specs->modedb_len, mode, num * sizeof(struct fb_videomode));
kfree(mode);
kfree(specs->modedb);
specs->modedb = m;
specs->modedb_len = specs->modedb_len + num;
}

/*
* VESA Generalized Timing Formula (GTF)
*/
Expand Down
2 changes: 2 additions & 0 deletions include/linux/fb.h
Original file line number Diff line number Diff line change
Expand Up @@ -1092,6 +1092,8 @@ extern int fb_parse_edid(unsigned char *edid, struct fb_var_screeninfo *var);
extern const unsigned char *fb_firmware_edid(struct device *device);
extern void fb_edid_to_monspecs(unsigned char *edid,
struct fb_monspecs *specs);
extern void fb_edid_add_monspecs(unsigned char *edid,
struct fb_monspecs *specs);
extern void fb_destroy_modedb(struct fb_videomode *modedb);
extern int fb_find_mode_cvt(struct fb_videomode *mode, int margins, int rb);
extern unsigned char *fb_ddc_read(struct i2c_adapter *adapter);
Expand Down

0 comments on commit 9fbbdde

Please sign in to comment.