svgalib: mode selection updates
This patch changes mode selection matching algorithm. It allows to choose mode with matching depth even when requested color lengths are greater than color lengths of every mode with requested color depth. It also fixes bug in s3fb - wrong error value returned when format is not supported by chip. Signed-off-by: Ondrej Zajicek <santiago@crfreenet.org> Signed-off-by: Antonino Daplas <adaplas@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:

committed by
Linus Torvalds

parent
d7dd91ff23
commit
d4b766a0bd
@@ -403,8 +403,13 @@ static int s3fb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
|
||||
|
||||
/* Find appropriate format */
|
||||
rv = svga_match_format (s3fb_formats, var, NULL);
|
||||
if ((rv < 0) || ((par->chip == CHIP_988_VIRGE_VX) ? (rv == 7) : (rv == 6)))
|
||||
{ /* 24bpp on VIRGE VX, 32bpp on others */
|
||||
|
||||
/* 32bpp mode is not supported on VIRGE VX,
|
||||
24bpp is not supported on others */
|
||||
if ((par->chip == CHIP_988_VIRGE_VX) ? (rv == 7) : (rv == 6))
|
||||
rv = -EINVAL;
|
||||
|
||||
if (rv < 0) {
|
||||
printk(KERN_ERR "fb%d: unsupported mode requested\n", info->node);
|
||||
return rv;
|
||||
}
|
||||
|
Reference in New Issue
Block a user