diff options
| author | Kamal Mostafa <kamal@whence.com> | 2013-02-21 16:42:07 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-21 17:22:16 -0800 |
| commit | 256fc0e57dc0fce1e698d1be55bedd26f6d6bb5a (patch) | |
| tree | 6a4344442e80f6176c54c8ee7fa16b5d1a1f0605 /drivers/video/console | |
| parent | 42b5dd51930c04dc6fb59c7c7a79354ff91bc9a4 (diff) | |
| download | blackbird-op-linux-256fc0e57dc0fce1e698d1be55bedd26f6d6bb5a.tar.gz blackbird-op-linux-256fc0e57dc0fce1e698d1be55bedd26f6d6bb5a.zip | |
fbcon: clear the logo bitmap from the margin area
Explicitly clear_margins when clearing the logo, in case the font dimensions
are non-integral to the framebuffer dimensions.
Signed-off-by: Kamal Mostafa <kamal@whence.com>
Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video/console')
| -rw-r--r-- | drivers/video/console/fbcon.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c index fdefa8fd72c4..f8a61e210d2e 100644 --- a/drivers/video/console/fbcon.c +++ b/drivers/video/console/fbcon.c @@ -1242,8 +1242,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 */ |
