diff mbox

[U-Boot] Fix bitmap offsets for non 8-bit LCDs

Message ID 1360813680-20508-1-git-send-email-andre@bluewatersys.com
State Accepted
Delegated to: Anatolij Gustschin
Headers show

Commit Message

Andre Renaud Feb. 14, 2013, 3:48 a.m. UTC 
Currently bitmap logos don't interpret the X coordinate correctly if the bpp
is anything other than 8.

Signed-off-by: Andre Renaud <andre@bluewatersys.com>
---
 common/lcd.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Comments

Anatolij Gustschin March 29, 2013, 11:08 a.m. UTC | #1 
Hello,

On Thu, 14 Feb 2013 16:48:00 +1300
Andre Renaud <andre@bluewatersys.com> wrote:

> Currently bitmap logos don't interpret the X coordinate correctly if the bpp
> is anything other than 8.
> 
> Signed-off-by: Andre Renaud <andre@bluewatersys.com>
> ---
>  common/lcd.c |    7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)

applied, thanks!

Anatolij
diff mbox

Patch

diff --git a/common/lcd.c b/common/lcd.c
index 66d4f94..ee47712 100644
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -589,15 +589,16 @@  void bitmap_plot(int x, int y)
 	immap_t *immr = (immap_t *) CONFIG_SYS_IMMR;
 	cpm8xx_t *cp = &(immr->im_cpm);
 #endif
+	unsigned bpix = NBITS(panel_info.vl_bpix);
 
 	debug("Logo: width %d  height %d  colors %d  cmap %d\n",
 		BMP_LOGO_WIDTH, BMP_LOGO_HEIGHT, BMP_LOGO_COLORS,
 		ARRAY_SIZE(bmp_logo_palette));
 
 	bmap = &bmp_logo_bitmap[0];
-	fb   = (uchar *)(lcd_base + y * lcd_line_length + x);
+	fb   = (uchar *)(lcd_base + y * lcd_line_length + x * bpix / 8);
 
-	if (NBITS(panel_info.vl_bpix) < 12) {
+	if (bpix < 12) {
 		/* Leave room for default color map
 		 * default case: generic system with no cmap (most likely 16bpp)
 		 * cmap was set to the source palette, so no change is done.
@@ -648,7 +649,7 @@  void bitmap_plot(int x, int y)
 	}
 	else { /* true color mode */
 		u16 col16;
-		fb16 = (ushort *)(lcd_base + y * lcd_line_length + x);
+		fb16 = (ushort *)fb;
 		for (i = 0; i < BMP_LOGO_HEIGHT; ++i) {
 			for (j = 0; j < BMP_LOGO_WIDTH; j++) {
 				col16 = bmp_logo_palette[(bmap[j]-16)];