Commit 958e43a0 authored by James Simmons's avatar James Simmons Committed by Linus Torvalds

[PATCH] Remove EDID parsing

This removes EDID support for VESA.  The EDID code needs more
developement which can be done on the side.

The results where mixed. It worked for some but not for others.
parent 533c8b27
...@@ -215,7 +215,6 @@ int __init vesafb_setup(char *options) ...@@ -215,7 +215,6 @@ int __init vesafb_setup(char *options)
int __init vesafb_init(void) int __init vesafb_init(void)
{ {
int video_cmap_len; int video_cmap_len;
char *edid = 0;
int i; int i;
if (screen_info.orig_video_isVGA != VIDEO_TYPE_VLFB) if (screen_info.orig_video_isVGA != VIDEO_TYPE_VLFB)
...@@ -300,18 +299,10 @@ int __init vesafb_init(void) ...@@ -300,18 +299,10 @@ int __init vesafb_init(void)
ypan = 0; ypan = 0;
} }
#ifdef __i386__ /* some dummy values for timing to make fbset happy */
edid = get_EDID_from_BIOS(0); vesafb_defined.pixclock = 10000000 / vesafb_defined.xres * 1000 / vesafb_defined.yres;
if (edid) vesafb_defined.left_margin = (vesafb_defined.xres / 8) & 0xf8;
parse_edid(edid, &vesafb_defined); vesafb_defined.hsync_len = (vesafb_defined.xres / 8) & 0xf8;
else
#endif
{
/* some dummy values for timing to make fbset happy */
vesafb_defined.pixclock = 10000000 / vesafb_defined.xres * 1000 / vesafb_defined.yres;
vesafb_defined.left_margin = (vesafb_defined.xres / 8) & 0xf8;
vesafb_defined.hsync_len = (vesafb_defined.xres / 8) & 0xf8;
}
if (vesafb_defined.bits_per_pixel > 8) { if (vesafb_defined.bits_per_pixel > 8) {
vesafb_defined.red.offset = screen_info.red_pos; vesafb_defined.red.offset = screen_info.red_pos;
......
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