aboutsummaryrefslogtreecommitdiffstats
path: root/arch/i386/boot/video.S
diff options
context:
space:
mode:
authorAntonino A. Daplas <adaplas@gmail.com>2005-09-09 16:04:34 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-09 16:57:59 -0400
commit5e518d7672dea4cd7c60871e40d0490c52f01d13 (patch)
treea97dc33b2ce9a0553fb6b9b3206ee7674ae4d06a /arch/i386/boot/video.S
parent53eed4ec8bcd8701b9135859ec46b10a0d88ba25 (diff)
[PATCH] fbdev: Resurrect hooks to get EDID from firmware
For the i386, code is already present in video.S that gets the EDID from the video BIOS. Make this visible so drivers can also use this data as fallback when i2c does not work. To ensure that the EDID block is returned for the primary graphics adapter only, by check if the IORESOURCE_ROM_SHADOW flag is set. 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/boot/video.S')
-rw-r--r--arch/i386/boot/video.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/boot/video.S b/arch/i386/boot/video.S
index 02bf625a681b..92f669470142 100644
--- a/arch/i386/boot/video.S
+++ b/arch/i386/boot/video.S
@@ -1949,7 +1949,7 @@ store_edid:
1949 movw $0x4f15, %ax # do VBE/DDC 1949 movw $0x4f15, %ax # do VBE/DDC
1950 movw $0x01, %bx 1950 movw $0x01, %bx
1951 movw $0x00, %cx 1951 movw $0x00, %cx
1952 movw $0x01, %dx 1952 movw $0x00, %dx
1953 movw $0x140, %di 1953 movw $0x140, %di
1954 int $0x10 1954 int $0x10
1955 1955