luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cirrusfb: remove 24 bpp mode

Browse Source 
The 24 bpp mode is not implemented.  Disallow it in the
cirrusfb_check_var() and remove it from checks.

Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Krzysztof Helt 2008-10-15 22:03:37 -07:00 committed by Linus Torvalds
parent 7528f54388
commit 1cea9a9a6c
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/video/cirrusfb.c
View File

@ -638,7 +638,6 @@ static int cirrusfb_check_var(struct fb_var_screeninfo *var,
break; /* 8 pixel per byte, only 1/4th of mem usable */ break; /* 8 pixel per byte, only 1/4th of mem usable */
case 8: case 8:
case 16: case 16:
case 24:
case 32: case 32:
break; /* 1 pixel == 1 byte */ break; /* 1 pixel == 1 byte */
default: default:
@ -713,7 +712,6 @@ static int cirrusfb_check_var(struct fb_var_screeninfo *var,
var->blue.length = 5; var->blue.length = 5;
break; break;
case 24:
case 32: case 32:
if (isPReP) { if (isPReP) {
var->red.offset = 8; var->red.offset = 8;
@ -782,7 +780,6 @@ static int cirrusfb_decode_var(const struct fb_var_screeninfo *var,
break; break;
case 16: case 16:
case 24:
case 32: case 32:
info->fix.line_length = var->xres_virtual * maxclockidx; info->fix.line_length = var->xres_virtual * maxclockidx;
info->fix.visual = FB_VISUAL_DIRECTCOLOR; info->fix.visual = FB_VISUAL_DIRECTCOLOR;
@ -1360,7 +1357,7 @@ static int cirrusfb_set_par_foo(struct fb_info *info)
*/ */
else if (var->bits_per_pixel == 32) { else if (var->bits_per_pixel == 32) {
DPRINTK("cirrusfb: preparing for 24/32 bit deep display\n"); DPRINTK("cirrusfb: preparing for 32 bit deep display\n");
switch (cinfo->btype) { switch (cinfo->btype) {
case BT_SD64: case BT_SD64:
/* Extended Sequencer Mode: 256c col. mode */ /* Extended Sequencer Mode: 256c col. mode */
@ -2233,7 +2230,7 @@ static int cirrusfb_set_fbinfo(struct fb_info *info)
if (cinfo->btype == BT_GD5480) { if (cinfo->btype == BT_GD5480) {
if (var->bits_per_pixel == 16) if (var->bits_per_pixel == 16)
info->screen_base += 1 * MB_; info->screen_base += 1 * MB_;
if (var->bits_per_pixel == 24 || var->bits_per_pixel == 32) if (var->bits_per_pixel == 32)
info->screen_base += 2 * MB_; info->screen_base += 2 * MB_;
} }