summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAntonino A. Daplas2006-03-27 11:17:29 +0200
committerLinus Torvalds2006-03-27 18:44:55 +0200
commit59153f7d7effdb5b3c81eb6d03914a866157b319 (patch)
tree59241e05d5fc0ba01070624c6c559004fe1b686a /arch
parent[PATCH] au1200fb: Alchemy Au1200 framebuffer driver (diff)
downloadkernel-qcow2-linux-59153f7d7effdb5b3c81eb6d03914a866157b319.tar.gz
kernel-qcow2-linux-59153f7d7effdb5b3c81eb6d03914a866157b319.tar.xz
kernel-qcow2-linux-59153f7d7effdb5b3c81eb6d03914a866157b319.zip
[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')
-rw-r--r--arch/i386/boot/video.S2
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