mirror of
https://github.com/torvalds/linux.git
synced 2024-11-22 12:11:40 +00:00
fbdev: vesafb: Detect VGA compatibility from screen info's VESA attributes
Test the vesa_attributes field in struct screen_info for compatibility with VGA hardware. Vesafb currently tests bit 1 in screen_info's capabilities field which indicates a 64-bit lfb address and is unrelated to VGA compatibility. Section 4.4 of the Vesa VBE 2.0 specifications defines that bit 5 in the mode's attributes field signals VGA compatibility. The mode is compatible with VGA hardware if the bit is clear. In that case, the driver can access VGA state of the VBE's underlying hardware. The vesafb driver uses this feature to program the color LUT in palette modes. Without, colors might be incorrect. The problem got introduced in commit89ec4c238e
("[PATCH] vesafb: Fix incorrect logo colors in x86_64"). It incorrectly stores the mode attributes in the screen_info's capabilities field and updates vesafb accordingly. Later, commit5e8ddcbe86
("Video mode probing support for the new x86 setup code") fixed the screen_info, but did not update vesafb. Color output still tends to work, because bit 1 in capabilities is usually 0. Besides fixing the bug in vesafb, this commit introduces a helper that reads the correct bit from screen_info. Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Fixes:5e8ddcbe86
("Video mode probing support for the new x86 setup code") Reviewed-by: Javier Martinez Canillas <javierm@redhat.com> Cc: <stable@vger.kernel.org> # v2.6.23+ Signed-off-by: Helge Deller <deller@gmx.de>
This commit is contained in:
parent
b03c351949
commit
c2bc958b2b
@ -271,7 +271,7 @@ static int vesafb_probe(struct platform_device *dev)
|
||||
if (si->orig_video_isVGA != VIDEO_TYPE_VLFB)
|
||||
return -ENODEV;
|
||||
|
||||
vga_compat = (si->capabilities & 2) ? 0 : 1;
|
||||
vga_compat = !__screen_info_vbe_mode_nonvga(si);
|
||||
vesafb_fix.smem_start = si->lfb_base;
|
||||
vesafb_defined.bits_per_pixel = si->lfb_depth;
|
||||
if (15 == vesafb_defined.bits_per_pixel)
|
||||
|
@ -49,6 +49,16 @@ static inline u64 __screen_info_lfb_size(const struct screen_info *si, unsigned
|
||||
return lfb_size;
|
||||
}
|
||||
|
||||
static inline bool __screen_info_vbe_mode_nonvga(const struct screen_info *si)
|
||||
{
|
||||
/*
|
||||
* VESA modes typically run on VGA hardware. Set bit 5 signals that this
|
||||
* is not the case. Drivers can then not make use of VGA resources. See
|
||||
* Sec 4.4 of the VBE 2.0 spec.
|
||||
*/
|
||||
return si->vesa_attributes & BIT(5);
|
||||
}
|
||||
|
||||
static inline unsigned int __screen_info_video_type(unsigned int type)
|
||||
{
|
||||
switch (type) {
|
||||
|
Loading…
Reference in New Issue
Block a user