Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

[cascardo/linux.git] / drivers / video / console / fbcon.c

diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index 501c599..3cd6759 100644 (file)
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -1275,8 +1275,16 @@ static void fbcon_clear(struct vc_data *vc, int sy, int sx, int height,
        if (!height || !width)
                return;
 
-       if (sy < vc->vc_top && vc->vc_top == logo_lines)
+       if (sy < vc->vc_top && vc->vc_top == logo_lines) {
                vc->vc_top = 0;
+               /*
+                * If the font dimensions are not an integral of the display
+                * dimensions then the ops->clear below won't end up clearing
+                * the margins.  Call clear_margins here in case the logo
+                * bitmap stretched into the margin area.
+                */
+               fbcon_clear_margins(vc, 0);
+       }
 
        /* Split blits that cross physical y_wrap boundary */