The patch titled cirrusfb: remove 24 bpp mode has been added to the -mm tree. Its filename is cirrusfb-remove-24-bpp-mode.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: cirrusfb: remove 24 bpp mode From: Krzysztof Helt <krzysztof.h1@xxxxx> 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@xxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/video/cirrusfb.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff -puN drivers/video/cirrusfb.c~cirrusfb-remove-24-bpp-mode drivers/video/cirrusfb.c --- a/drivers/video/cirrusfb.c~cirrusfb-remove-24-bpp-mode +++ a/drivers/video/cirrusfb.c @@ -638,7 +638,6 @@ static int cirrusfb_check_var(struct fb_ break; /* 8 pixel per byte, only 1/4th of mem usable */ case 8: case 16: - case 24: case 32: break; /* 1 pixel == 1 byte */ default: @@ -713,7 +712,6 @@ static int cirrusfb_check_var(struct fb_ var->blue.length = 5; break; - case 24: case 32: if (isPReP) { var->red.offset = 8; @@ -782,7 +780,6 @@ static int cirrusfb_decode_var(const str break; case 16: - case 24: case 32: info->fix.line_length = var->xres_virtual * maxclockidx; info->fix.visual = FB_VISUAL_DIRECTCOLOR; @@ -1360,7 +1357,7 @@ static int cirrusfb_set_par_foo(struct f */ 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) { case BT_SD64: /* Extended Sequencer Mode: 256c col. mode */ @@ -2233,7 +2230,7 @@ static int cirrusfb_set_fbinfo(struct fb if (cinfo->btype == BT_GD5480) { if (var->bits_per_pixel == 16) 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_; } _ Patches currently in -mm which might be from krzysztof.h1@xxxxx are cirrusfb-check_par-fixes.patch tdfxfb-fix-sdram-memory-size-detection.patch tdfxfb-fix-frame-buffer-name-overrun.patch linux-next.patch fb-metronome-printk-format-warning.patch rtc-m48t59-reduce-structure-m48t59_private.patch rtc-m48t59-add-support-for-m48t02-and-m48t59-chips-2nd-rev.patch fb-convert-lock-unlock_kernel-into-local-fb-mutex.patch neofb-reduce-panning-function.patch viafb-accelc-accelh-update.patch viafb-viafbdevc-update.patch fbdev-kconfig-update.patch fbdev-kconfig-update-fix.patch neofb-kill-some-redundant-code.patch vga16fb-remove-open_lock-mutex.patch neofb-remove-open_lock-mutex.patch cirrusfb-remove-information-about-memory-size-during-mode-change.patch cirrusfb-simplify-clock-calculation.patch cirrusfb-remove-24-bpp-mode.patch cirrusfb-drop-device-pointers-from-cirrusfb_info.patch tdfxfb-do-not-make-changes-to-default-tdfx_fix.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html