Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1692b37c authored by Antonino A. Daplas's avatar Antonino A. Daplas Committed by Linus Torvalds
Browse files

fbdev: Fix logo if logo depth is less than framebuffer depth 



The VGA16 logo (bpp = 4) and monochrome logo (bpp = 1) do not contain any
color information (no CLUT).  If the fb depth is > logo depth, these logo's
will not properly display. Fix by using the console palette instead of
creating a new one.

Signed-off-by: default avatarAntonino Daplas <adaplas@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c81f717c

drivers/video/fbmem.c

+26 −16
Original line number Diff line number Diff line
@@ -244,8 +244,17 @@ static void fb_set_logo(struct fb_info *info, 
	u8 xor = (info->fix.visual == FB_VISUAL_MONO01) ? 0xff : 0;

	u8 fg = 1, d;



	if (fb_get_color_depth(&info->var, &info->fix) == 3)

	switch (fb_get_color_depth(&info->var, &info->fix)) {

	case 1:

		fg = 1;

		break;

	case 2:

		fg = 3;

		break;

	default:

		fg = 7;

		break;

	}



	if (info->fix.visual == FB_VISUAL_MONO01 ||

	    info->fix.visual == FB_VISUAL_MONO10)
@@ -564,21 +573,6 @@ int fb_prepare_logo(struct fb_info *info, int rotate) 
		depth = 4;

	}



	if (depth >= 8) {

		switch (info->fix.visual) {

		case FB_VISUAL_TRUECOLOR:

			fb_logo.needs_truepalette = 1;

			break;

		case FB_VISUAL_DIRECTCOLOR:

			fb_logo.needs_directpalette = 1;

			fb_logo.needs_cmapreset = 1;

			break;

		case FB_VISUAL_PSEUDOCOLOR:

			fb_logo.needs_cmapreset = 1;

			break;

		}

	}



	/* Return if no suitable logo was found */

	fb_logo.logo = fb_find_logo(depth);
@@ -604,6 +598,22 @@ int fb_prepare_logo(struct fb_info *info, int rotate) 
	else

		fb_logo.depth = 1;





 	if (fb_logo.depth > 4 && depth > 4) {

 		switch (info->fix.visual) {

 		case FB_VISUAL_TRUECOLOR:

 			fb_logo.needs_truepalette = 1;

 			break;

 		case FB_VISUAL_DIRECTCOLOR:

 			fb_logo.needs_directpalette = 1;

 			fb_logo.needs_cmapreset = 1;

 			break;

 		case FB_VISUAL_PSEUDOCOLOR:

 			fb_logo.needs_cmapreset = 1;

 			break;

 		}

 	}



	return fb_prepare_extra_logos(info, fb_logo.logo->height, yres);

}