diff options
| author | Antonino A. Daplas <adaplas@gmail.com> | 2005-09-09 13:04:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 13:57:59 -0700 |
| commit | 5e518d7672dea4cd7c60871e40d0490c52f01d13 (patch) | |
| tree | a97dc33b2ce9a0553fb6b9b3206ee7674ae4d06a /arch/i386 | |
| parent | 53eed4ec8bcd8701b9135859ec46b10a0d88ba25 (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')
| -rw-r--r-- | arch/i386/boot/video.S | 2 | ||||
| -rw-r--r-- | arch/i386/kernel/setup.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/i386/boot/video.S b/arch/i386/boot/video.S index 02bf625a681..92f66947014 100644 --- a/arch/i386/boot/video.S +++ b/arch/i386/boot/video.S @@ -1949,7 +1949,7 @@ store_edid: movw $0x4f15, %ax # do VBE/DDC movw $0x01, %bx movw $0x00, %cx - movw $0x01, %dx + movw $0x00, %dx movw $0x140, %di int $0x10 diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c index a659d274914..fa0c69eb937 100644 --- a/arch/i386/kernel/setup.c +++ b/arch/i386/kernel/setup.c @@ -139,6 +139,7 @@ struct sys_desc_table_struct { unsigned char table[0]; }; struct edid_info edid_info; +EXPORT_SYMBOL_GPL(edid_info); struct ist_info ist_info; #if defined(CONFIG_X86_SPEEDSTEP_SMI) || \ defined(CONFIG_X86_SPEEDSTEP_SMI_MODULE) |