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

Commit 82235e91 authored by Russell King's avatar Russell King
Browse files

[PATCH] ARM: Fix AMBA CLCD fb driver for 32bpp 



We were supporting 24bpp.  However, the pixel organisation in
memory was 0RGB, so it was 24bpp in 32bit words.  This means
we're actually supporting 32bpp and not 24bpp.

Also, add a check to ensure that we don't exceed the available
framebuffer when changing display resolutions.

Signed-off-by: default avatarRussell King <rmk@arm.linux.org.uk>
parent c4d12b98

drivers/video/amba-clcd.c

+7 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ clcdfb_set_bitfields(struct clcd_fb *fb, struct fb_var_screeninfo *var) 
			var->blue.offset	= 10;

		}

		break;

	case 24:

	case 32:

		if (fb->panel->cntl & CNTL_LCDTFT) {

			var->red.length		= 8;

			var->green.length	= 8;
@@ -178,6 +178,12 @@ static int clcdfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) 


	if (fb->board->check)

		ret = fb->board->check(fb, var);



	if (ret == 0 &&

	    var->xres_virtual * var->bits_per_pixel / 8 *

	    var->yres_virtual > fb->fb.fix.smem_len)

		ret = -EINVAL;



	if (ret == 0)

		ret = clcdfb_set_bitfields(fb, var);

include/asm-arm/hardware/amba_clcd.h

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ static inline void clcdfb_decode(struct clcd_fb *fb, struct clcd_regs *regs) 
	case 16:

		val |= CNTL_LCDBPP16;

		break;

	case 24:

	case 32:

		val |= CNTL_LCDBPP24;

		break;

	}