summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaul Munoz <raul.munoz@toradex.com>2014-08-04 11:28:48 +0200
committerRaul Munoz <raul.munoz@toradex.com>2014-08-04 11:28:48 +0200
commit4dd83942b418b937e3da02746baabf63f37fe682 (patch)
tree3f6a29c13deb90131137d868a7f7120a8b913379
parent2f6ab2173097420f32bf5bf7f18efa4725b3246d (diff)
fbcon: workaround full screen custom boot logo issue and disable cursor
Force round down in division calculating required logo height as preceding code did round up as follows: logo_lines = DIV_ROUND_UP(logo_height, vc->vc_font.height); Which resulted in no boot-logo shown at all due to not enough lines being available. Additionally disable cursor for custom boot logo.
-rw-r--r--drivers/video/console/fbcon.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index 8745637..cff5ea5 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -633,6 +633,11 @@ static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info,
kfree(save);
}
+#ifdef CONFIG_LOGO_CUSTOM_CLUT224
+ /* workaround full screen custom boot logo issue */
+ logo_lines = logo_lines - 1;
+#endif /* CONFIG_LOGO_CUSTOM_CLUT224 */
+
if (logo_lines > vc->vc_bottom) {
logo_shown = FBCON_LOGO_CANSHOW;
printk(KERN_INFO
@@ -1288,6 +1293,11 @@ static void fbcon_cursor(struct vc_data *vc, int mode)
int y;
int c = scr_readw((u16 *) vc->vc_pos);
+#ifdef CONFIG_LOGO_CUSTOM_CLUT224
+ /* disable cursor for custom boot logo */
+ vc->vc_deccm = 0;
+#endif /* CONFIG_LOGO_CUSTOM_CLUT224 */
+
if (fbcon_is_inactive(vc, info) || vc->vc_deccm != 1)
return;