From: Vadim Bendebury Date: Fri, 28 Sep 2012 15:11:17 +0000 (+0000) Subject: video: Skip bitmaps which do not fit into the screen in cfb_console X-Git-Tag: v2013.01-rc2~139^2~4 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d484b52e6fcb28dc011ce45718294496c6ea83d0;p=oweals%2Fu-boot.git video: Skip bitmaps which do not fit into the screen in cfb_console The cfb console driver is trying to prevent bitmaps to spill over the screen, but the calculations assume that at least part of the bitmap fits into the screen area. In reality there could be bitmap elements which are completely out of the screen area, they just need to be discarded. Signed-off-by: Vadim Bendebury Signed-off-by: Simon Glass --- diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c index 6f5d4f2957..9388859da7 100644 --- a/drivers/video/cfb_console.c +++ b/drivers/video/cfb_console.c @@ -1515,6 +1515,13 @@ int video_display_bitmap(ulong bmp_image, int x, int y) padded_line = (((width * bpp + 7) / 8) + 3) & ~0x3; + /* + * Just ignore elements which are completely beyond screen + * dimensions. + */ + if ((x >= VIDEO_VISIBLE_COLS) || (y >= VIDEO_VISIBLE_ROWS)) + return 0; + #ifdef CONFIG_SPLASH_SCREEN_ALIGN if (x == BMP_ALIGN_CENTER) x = max(0, (VIDEO_VISIBLE_COLS - width) / 2);