[U-Boot] [PATCH] video: cfb_console: add support for 4bpp bitmaps with GDF_32BIT_X888RGB

[Timur Tabi]

Add support for 4bpp bitmaps, but only when writing to a GDF_32BIT_X888RGB.

Signed-off-by: Timur Tabi <timur at freescale.com>
---

I only added support for GDF_32BIT_X888RGB because that's the only mode
that my video device supports in U-Boot.  I wouldn't be able to test any
other mode, and it took a lot of trial and error to get this one mode working
correctly.

 drivers/video/cfb_console.c |   26 +++++++++++++++++++++++++-
 1 files changed, 25 insertions(+), 1 deletions(-)

diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
index fae5417..1d52819 100644
--- a/drivers/video/cfb_console.c
+++ b/drivers/video/cfb_console.c
@@ -1114,8 +1114,32 @@ int video_display_bitmap (ulong bmp_image, int x, int y)
 	}
 #endif
 
-	/* We handle only 8bpp or 24 bpp bitmap */
+	/* We handle only 4, 8, or 24 bpp bitmaps */
 	switch (le16_to_cpu (bmp->header.bit_count)) {
+	case 4:
+		padded_line -= width / 2;
+		ycount = height;
+
+		switch (VIDEO_DATA_FORMAT) {
+		case GDF_32BIT_X888RGB:
+			while (ycount--) {
+				WATCHDOG_RESET ();
+				/* Don't assume that 'width' is an even number */
+				for (xcount = 0; xcount < width; xcount++) {
+					if (xcount & 1) {
+						cte = bmp->color_table[*bmap & 0xF];
+						bmap++;
+					} else
+						cte = bmp->color_table[*bmap >> 4];
+					FILL_32BIT_X888RGB(cte.red, cte.green, cte.blue);
+				}
+				bmap += padded_line;
+				fb -= (VIDEO_VISIBLE_COLS + width) * VIDEO_PIXEL_SIZE;
+			}
+			break;
+		}
+		break;
+
 	case 8:
 		padded_line -= width;
 		if (VIDEO_DATA_FORMAT == GDF__8BIT_INDEX) {
-- 
1.7.0.1