diff options
| author | Antonino A. Daplas <adaplas@gmail.com> | 2006-04-10 22:55:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-11 06:18:54 -0700 |
| commit | 89ec4c238e7a3d7e660291f3f1a8181381baad77 (patch) | |
| tree | 8ba2ab49cea71cfff21ee7a56717f83746cb8d0c /arch/i386 | |
| parent | ac50ab3e45436900b5d73edd0c6b0744af560535 (diff) | |
| download | op-kernel-dev-89ec4c238e7a3d7e660291f3f1a8181381baad77.zip op-kernel-dev-89ec4c238e7a3d7e660291f3f1a8181381baad77.tar.gz | |
[PATCH] vesafb: Fix incorrect logo colors in x86_64
Bugzilla Bug 6299:
A pixel size of 8 bits produces wrong logo colors in x86_64.
The driver has 2 methods for setting the color map, using the protected
mode interface provided by the video BIOS and directly writing to the VGA
registers. The former is not supported in x86_64 and the latter is enabled
only in i386.
Fix by enabling the latter method in x86_64 only if supported by the BIOS.
If both methods are unsupported, change the visual of vesafb to
STATIC_PSEUDOCOLOR.
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 | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/i386/boot/video.S b/arch/i386/boot/video.S index 0000a26..c9343c3a 100644 --- a/arch/i386/boot/video.S +++ b/arch/i386/boot/video.S @@ -97,6 +97,7 @@ #define PARAM_VESAPM_OFF 0x30 #define PARAM_LFB_PAGES 0x32 #define PARAM_VESA_ATTRIB 0x34 +#define PARAM_CAPABILITIES 0x36 /* Define DO_STORE according to CONFIG_VIDEO_RETAIN */ #ifdef CONFIG_VIDEO_RETAIN @@ -233,6 +234,10 @@ mopar_gr: movw 18(%di), %ax movl %eax, %fs:(PARAM_LFB_SIZE) +# store mode capabilities + movl 10(%di), %eax + movl %eax, %fs:(PARAM_CAPABILITIES) + # switching the DAC to 8-bit is for <= 8 bpp only movw %fs:(PARAM_LFB_DEPTH), %ax cmpw $8, %ax |
