Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 256fc0e5 authored by Kamal Mostafa's avatar Kamal Mostafa Committed by Linus Torvalds
Browse files

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: default avatarKamal Mostafa <kamal@whence.com>
Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 42b5dd51

drivers/video/console/fbcon.c

+9 −1
Original line number Diff line number Diff line
@@ -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 */