aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/screen_info.h
diff options
context:
space:
mode:
authorAntonino A. Daplas <adaplas@gmail.com>2006-04-10 22:55:48 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-11 06:18:54 -0700
commit89ec4c238e7a3d7e660291f3f1a8181381baad77 (patch)
tree8ba2ab49cea71cfff21ee7a56717f83746cb8d0c /include/linux/screen_info.h
parent[PATCH] sparc32 vga support (diff)
downloadlinux-dev-89ec4c238e7a3d7e660291f3f1a8181381baad77.tar.xz
linux-dev-89ec4c238e7a3d7e660291f3f1a8181381baad77.zip
[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 'include/linux/screen_info.h')
-rw-r--r--include/linux/screen_info.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/screen_info.h b/include/linux/screen_info.h
index 6336987dae62..2925e66a6732 100644
--- a/include/linux/screen_info.h
+++ b/include/linux/screen_info.h
@@ -41,7 +41,8 @@ struct screen_info {
u16 vesapm_off; /* 0x30 */
u16 pages; /* 0x32 */
u16 vesa_attributes; /* 0x34 */
- /* 0x36 -- 0x3f reserved for future expansion */
+ u32 capabilities; /* 0x36 */
+ /* 0x3a -- 0x3f reserved for future expansion */
};
extern struct screen_info screen_info;