Skip to content

L
linux-davinci-2.6.23
Commit 33a9f640 authored by Antonino A. Daplas's avatar Antonino A. Daplas Committed by Linus Torvalds
Browse files
Options

fbdev: add Ultrasharp UXGA to broken monitor database 

This particular monitor does not have a limits block and has only one set of
monitor timings.  Fix by adding a limits block to the EDID and extend the
horizontal sync frequency range to 30 kHz and 75 Khz.
Signed-off-by: default avatarAntonino Daplas <adaplas@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3b769be9
Hide whitespace changes
Inline Side-by-side
Showing with 113 additions and 56 deletions
drivers/video/fbmon.c
View file @ 33a9f640
...@@ -48,8 +48,9 @@ ...@@ -48,8 +48,9 @@
#define DPRINTK(fmt, args...) #define DPRINTK(fmt, args...)
#endif #endif
#define FBMON_FIX_HEADER 1 #define FBMON_FIX_HEADER 1
#define FBMON_FIX_INPUT 2 #define FBMON_FIX_INPUT 2
#define FBMON_FIX_TIMINGS 3
#ifdef CONFIG_FB_MODE_HELPERS #ifdef CONFIG_FB_MODE_HELPERS
struct broken_edid { struct broken_edid {
...@@ -71,6 +72,12 @@ static const struct broken_edid brokendb[] = { ...@@ -71,6 +72,12 @@ static const struct broken_edid brokendb[] = {
.model = 0x5a44, .model = 0x5a44,
.fix = FBMON_FIX_INPUT, .fix = FBMON_FIX_INPUT,
}, },
/* Sharp UXGA? */
{
.manufacturer = "SHP",
.model = 0x138e,
.fix = FBMON_FIX_TIMINGS,
},
}; };
static const unsigned char edid_v1_header[] = { 0x00, 0xff, 0xff, 0xff, static const unsigned char edid_v1_header[] = { 0x00, 0xff, 0xff, 0xff,
...@@ -87,6 +94,55 @@ static void copy_string(unsigned char *c, unsigned char *s) ...@@ -87,6 +94,55 @@ static void copy_string(unsigned char *c, unsigned char *s)
while (i-- && (*--s == 0x20)) *s = 0; while (i-- && (*--s == 0x20)) *s = 0;
} }
static int edid_is_serial_block(unsigned char *block)
{
if ((block[0] == 0x00) && (block[1] == 0x00) &&
(block[2] == 0x00) && (block[3] == 0xff) &&
(block[4] == 0x00))
return 1;
else
return 0;
}
static int edid_is_ascii_block(unsigned char *block)
{
if ((block[0] == 0x00) && (block[1] == 0x00) &&
(block[2] == 0x00) && (block[3] == 0xfe) &&
(block[4] == 0x00))
return 1;
else
return 0;
}
static int edid_is_limits_block(unsigned char *block)
{
if ((block[0] == 0x00) && (block[1] == 0x00) &&
(block[2] == 0x00) && (block[3] == 0xfd) &&
(block[4] == 0x00))
return 1;
else
return 0;
}
static int edid_is_monitor_block(unsigned char *block)
{
if ((block[0] == 0x00) && (block[1] == 0x00) &&
(block[2] == 0x00) && (block[3] == 0xfc) &&
(block[4] == 0x00))
return 1;
else
return 0;
}
static int edid_is_timing_block(unsigned char *block)
{
if ((block[0] != 0x00) || (block[1] != 0x00) ||
(block[2] != 0x00) || (block[4] != 0x00))
return 1;
else
return 0;
}
static int check_edid(unsigned char *edid) static int check_edid(unsigned char *edid)
{ {
unsigned char *block = edid + ID_MANUFACTURER_NAME, manufacturer[4]; unsigned char *block = edid + ID_MANUFACTURER_NAME, manufacturer[4];
...@@ -104,9 +160,6 @@ static int check_edid(unsigned char *edid) ...@@ -104,9 +160,6 @@ static int check_edid(unsigned char *edid)
for (i = 0; i < ARRAY_SIZE(brokendb); i++) { for (i = 0; i < ARRAY_SIZE(brokendb); i++) {
if (!strncmp(manufacturer, brokendb[i].manufacturer, 4) && if (!strncmp(manufacturer, brokendb[i].manufacturer, 4) &&
brokendb[i].model == model) { brokendb[i].model == model) {
printk("fbmon: The EDID Block of "
"Manufacturer: %s Model: 0x%x is known to "
"be broken,\n", manufacturer, model);
fix = brokendb[i].fix; fix = brokendb[i].fix;
break; break;
} }
...@@ -115,8 +168,10 @@ static int check_edid(unsigned char *edid) ...@@ -115,8 +168,10 @@ static int check_edid(unsigned char *edid)
switch (fix) { switch (fix) {
case FBMON_FIX_HEADER: case FBMON_FIX_HEADER:
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
if (edid[i] != edid_v1_header[i]) if (edid[i] != edid_v1_header[i]) {
ret = fix; ret = fix;
break;
}
} }
break; break;
case FBMON_FIX_INPUT: case FBMON_FIX_INPUT:
...@@ -126,14 +181,34 @@ static int check_edid(unsigned char *edid) ...@@ -126,14 +181,34 @@ static int check_edid(unsigned char *edid)
if (b[4] & 0x01 && b[0] & 0x80) if (b[4] & 0x01 && b[0] & 0x80)
ret = fix; ret = fix;
break; break;
case FBMON_FIX_TIMINGS:
b = edid + DETAILED_TIMING_DESCRIPTIONS_START;
ret = fix;
for (i = 0; i < 4; i++) {
if (edid_is_limits_block(b)) {
ret = 0;
break;
}
b += DETAILED_TIMING_DESCRIPTION_SIZE;
}
break;
} }
if (ret)
printk("fbmon: The EDID Block of "
"Manufacturer: %s Model: 0x%x is known to "
"be broken,\n", manufacturer, model);
return ret; return ret;
} }
static void fix_edid(unsigned char *edid, int fix) static void fix_edid(unsigned char *edid, int fix)
{ {
unsigned char *b; int i;
unsigned char *b, csum = 0;
switch (fix) { switch (fix) {
case FBMON_FIX_HEADER: case FBMON_FIX_HEADER:
...@@ -145,6 +220,37 @@ static void fix_edid(unsigned char *edid, int fix) ...@@ -145,6 +220,37 @@ static void fix_edid(unsigned char *edid, int fix)
b = edid + EDID_STRUCT_DISPLAY; b = edid + EDID_STRUCT_DISPLAY;
b[0] &= ~0x80; b[0] &= ~0x80;
edid[127] += 0x80; edid[127] += 0x80;
break;
case FBMON_FIX_TIMINGS:
printk("fbmon: trying to fix monitor timings\n");
b = edid + DETAILED_TIMING_DESCRIPTIONS_START;
for (i = 0; i < 4; i++) {
if (!(edid_is_serial_block(b) ||
edid_is_ascii_block(b) ||
edid_is_monitor_block(b) ||
edid_is_timing_block(b))) {
b[0] = 0x00;
b[1] = 0x00;
b[2] = 0x00;
b[3] = 0xfd;
b[4] = 0x00;
b[5] = 60; /* vfmin */
b[6] = 60; /* vfmax */
b[7] = 30; /* hfmin */
b[8] = 75; /* hfmax */
b[9] = 17; /* pixclock - 170 MHz*/
b[10] = 0; /* GTF */
break;
}
b += DETAILED_TIMING_DESCRIPTION_SIZE;
}
for (i = 0; i < EDID_LENGTH - 1; i++)
csum += edid[i];
edid[127] = 256 - csum;
break;
} }
} }
...@@ -273,46 +379,6 @@ static void get_chroma(unsigned char *block, struct fb_monspecs *specs) ...@@ -273,46 +379,6 @@ static void get_chroma(unsigned char *block, struct fb_monspecs *specs)
DPRINTK("WhiteY: 0.%03d\n", specs->chroma.whitey); DPRINTK("WhiteY: 0.%03d\n", specs->chroma.whitey);
} }
static int edid_is_serial_block(unsigned char *block)
{
if ((block[0] == 0x00) && (block[1] == 0x00) &&
(block[2] == 0x00) && (block[3] == 0xff) &&
(block[4] == 0x00))
return 1;
else
return 0;
}
static int edid_is_ascii_block(unsigned char *block)
{
if ((block[0] == 0x00) && (block[1] == 0x00) &&
(block[2] == 0x00) && (block[3] == 0xfe) &&
(block[4] == 0x00))
return 1;
else
return 0;
}
static int edid_is_limits_block(unsigned char *block)
{
if ((block[0] == 0x00) && (block[1] == 0x00) &&
(block[2] == 0x00) && (block[3] == 0xfd) &&
(block[4] == 0x00))
return 1;
else
return 0;
}
static int edid_is_monitor_block(unsigned char *block)
{
if ((block[0] == 0x00) && (block[1] == 0x00) &&
(block[2] == 0x00) && (block[3] == 0xfc) &&
(block[4] == 0x00))
return 1;
else
return 0;
}
static void calc_mode_timings(int xres, int yres, int refresh, static void calc_mode_timings(int xres, int yres, int refresh,
struct fb_videomode *mode) struct fb_videomode *mode)
{ {
...@@ -795,15 +861,6 @@ static void get_monspecs(unsigned char *edid, struct fb_monspecs *specs) ...@@ -795,15 +861,6 @@ static void get_monspecs(unsigned char *edid, struct fb_monspecs *specs)
} }
} }
static int edid_is_timing_block(unsigned char *block)
{
if ((block[0] != 0x00) || (block[1] != 0x00) ||
(block[2] != 0x00) || (block[4] != 0x00))
return 1;
else
return 0;
}
int fb_parse_edid(unsigned char *edid, struct fb_var_screeninfo *var) int fb_parse_edid(unsigned char *edid, struct fb_var_screeninfo *var)
{ {
int i; int i;
......
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