diff options
-rw-r--r-- | drivers/video/cirrusfb.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c index dfd12a2dfe72..4888ff69f802 100644 --- a/drivers/video/cirrusfb.c +++ b/drivers/video/cirrusfb.c | |||
@@ -638,7 +638,6 @@ static int cirrusfb_check_var(struct fb_var_screeninfo *var, | |||
638 | break; /* 8 pixel per byte, only 1/4th of mem usable */ | 638 | break; /* 8 pixel per byte, only 1/4th of mem usable */ |
639 | case 8: | 639 | case 8: |
640 | case 16: | 640 | case 16: |
641 | case 24: | ||
642 | case 32: | 641 | case 32: |
643 | break; /* 1 pixel == 1 byte */ | 642 | break; /* 1 pixel == 1 byte */ |
644 | default: | 643 | default: |
@@ -713,7 +712,6 @@ static int cirrusfb_check_var(struct fb_var_screeninfo *var, | |||
713 | var->blue.length = 5; | 712 | var->blue.length = 5; |
714 | break; | 713 | break; |
715 | 714 | ||
716 | case 24: | ||
717 | case 32: | 715 | case 32: |
718 | if (isPReP) { | 716 | if (isPReP) { |
719 | var->red.offset = 8; | 717 | var->red.offset = 8; |
@@ -782,7 +780,6 @@ static int cirrusfb_decode_var(const struct fb_var_screeninfo *var, | |||
782 | break; | 780 | break; |
783 | 781 | ||
784 | case 16: | 782 | case 16: |
785 | case 24: | ||
786 | case 32: | 783 | case 32: |
787 | info->fix.line_length = var->xres_virtual * maxclockidx; | 784 | info->fix.line_length = var->xres_virtual * maxclockidx; |
788 | info->fix.visual = FB_VISUAL_DIRECTCOLOR; | 785 | info->fix.visual = FB_VISUAL_DIRECTCOLOR; |
@@ -1360,7 +1357,7 @@ static int cirrusfb_set_par_foo(struct fb_info *info) | |||
1360 | */ | 1357 | */ |
1361 | 1358 | ||
1362 | else if (var->bits_per_pixel == 32) { | 1359 | else if (var->bits_per_pixel == 32) { |
1363 | DPRINTK("cirrusfb: preparing for 24/32 bit deep display\n"); | 1360 | DPRINTK("cirrusfb: preparing for 32 bit deep display\n"); |
1364 | switch (cinfo->btype) { | 1361 | switch (cinfo->btype) { |
1365 | case BT_SD64: | 1362 | case BT_SD64: |
1366 | /* Extended Sequencer Mode: 256c col. mode */ | 1363 | /* Extended Sequencer Mode: 256c col. mode */ |
@@ -2233,7 +2230,7 @@ static int cirrusfb_set_fbinfo(struct fb_info *info) | |||
2233 | if (cinfo->btype == BT_GD5480) { | 2230 | if (cinfo->btype == BT_GD5480) { |
2234 | if (var->bits_per_pixel == 16) | 2231 | if (var->bits_per_pixel == 16) |
2235 | info->screen_base += 1 * MB_; | 2232 | info->screen_base += 1 * MB_; |
2236 | if (var->bits_per_pixel == 24 || var->bits_per_pixel == 32) | 2233 | if (var->bits_per_pixel == 32) |
2237 | info->screen_base += 2 * MB_; | 2234 | info->screen_base += 2 * MB_; |
2238 | } | 2235 | } |
2239 | 2236 | ||