summaryrefslogtreecommitdiff
path: root/drivers/video
diff options
context:
space:
mode:
authorMatthias Weisser <weisserm@arcor.de>2013-02-15 03:35:12 +0000
committerAnatolij Gustschin <agust@denx.de>2013-03-21 10:55:24 +0100
commitacf3baad23586bcaf9af608b8c31949ab54e8338 (patch)
treebb82c565d245692d544eced5e99ed9d7ea3d5ace /drivers/video
parent317461c1db97abef243964ae4c7cc7d3485ec73f (diff)
downloadu-boot-imx-acf3baad23586bcaf9af608b8c31949ab54e8338.zip
u-boot-imx-acf3baad23586bcaf9af608b8c31949ab54e8338.tar.gz
u-boot-imx-acf3baad23586bcaf9af608b8c31949ab54e8338.tar.bz2
video: Fix splash screen alignment
commit d484b52 "video: Skip bitmaps which do not fit into the screen in cfb_console" breaks splash screen alignment which is passed in as magic (BMP_ALIGN_CENTER) x/y coordinates. Moving the check after the alignment block fixes this. Signed-off-by: Matthias Weisser <weisserm@arcor.de> Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/cfb_console.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
index 26f673a..61e1058 100644
--- a/drivers/video/cfb_console.c
+++ b/drivers/video/cfb_console.c
@@ -1515,13 +1515,6 @@ 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);
@@ -1534,6 +1527,13 @@ int video_display_bitmap(ulong bmp_image, int x, int y)
y = max(0, VIDEO_VISIBLE_ROWS - height + y + 1);
#endif /* CONFIG_SPLASH_SCREEN_ALIGN */
+ /*
+ * Just ignore elements which are completely beyond screen
+ * dimensions.
+ */
+ if ((x >= VIDEO_VISIBLE_COLS) || (y >= VIDEO_VISIBLE_ROWS))
+ return 0;
+
if ((x + width) > VIDEO_VISIBLE_COLS)
width = VIDEO_VISIBLE_COLS - x;
if ((y + height) > VIDEO_VISIBLE_ROWS)