diff options
| author | Antonino A. Daplas <adaplas@gmail.com> | 2006-03-27 01:17:29 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-27 08:44:55 -0800 |
| commit | 59153f7d7effdb5b3c81eb6d03914a866157b319 (patch) | |
| tree | 59241e05d5fc0ba01070624c6c559004fe1b686a /arch/i386 | |
| parent | f95ec3c6df271ae4e6290cd6b95c18a009c76dc9 (diff) | |
| download | linux-59153f7d7effdb5b3c81eb6d03914a866157b319.tar.bz2 | |
[PATCH] fbdev: Make BIOS EDID reading configurable
DDC reading via the Video BIOS may take several tens of seconds with some
combination of display cards and monitors.
Make this option configurable. It defaults to `y' to minimise disruption.
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/i386')
| -rw-r--r-- | arch/i386/boot/video.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/i386/boot/video.S b/arch/i386/boot/video.S index 2ac40c8244c4..0000a2674537 100644 --- a/arch/i386/boot/video.S +++ b/arch/i386/boot/video.S @@ -1924,6 +1924,7 @@ skip10: movb %ah, %al ret store_edid: +#ifdef CONFIG_FB_FIRMWARE_EDID pushw %es # just save all registers pushw %ax pushw %bx @@ -1954,6 +1955,7 @@ store_edid: popw %bx popw %ax popw %es +#endif ret # VIDEO_SELECT-only variables |