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

Commit 4e1567d3 authored by Antonino A. Daplas's avatar Antonino A. Daplas Committed by Linus Torvalds
Browse files

[PATCH] fbcon: Avoid illegal display panning 



Avoid calls to fb_pan_display when driver is suspended or not in text mode.

Signed-off-by: default avatarAntonino Daplas <adaplas@pol.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 1207069f

drivers/video/console/fbcon.c

+19 −6
Original line number Diff line number Diff line
@@ -2146,8 +2146,12 @@ static int fbcon_switch(struct vc_data *vc) 


	scrollback_max = 0;

	scrollback_current = 0;



	if (!fbcon_is_inactive(vc, info)) {

	    ops->var.xoffset = ops->var.yoffset = p->yscroll = 0;

	    ops->update_start(info);

	}



	fbcon_set_palette(vc, color_table); 	

	fbcon_clear_margins(vc, 0);
@@ -2746,8 +2750,12 @@ static void fbcon_modechanged(struct fb_info *info) 
		updatescrollmode(p, info, vc);

		scrollback_max = 0;

		scrollback_current = 0;



		if (!fbcon_is_inactive(vc, info)) {

		    ops->var.xoffset = ops->var.yoffset = p->yscroll = 0;

		    ops->update_start(info);

		}



		fbcon_set_palette(vc, color_table);

		update_screen(vc);

		if (softback_buf)
@@ -2784,8 +2792,13 @@ static void fbcon_set_all_vcs(struct fb_info *info) 
			updatescrollmode(p, info, vc);

			scrollback_max = 0;

			scrollback_current = 0;

			ops->var.xoffset = ops->var.yoffset = p->yscroll = 0;



			if (!fbcon_is_inactive(vc, info)) {

			    ops->var.xoffset = ops->var.yoffset =

				p->yscroll = 0;

			    ops->update_start(info);

			}



			fbcon_set_palette(vc, color_table);

			update_screen(vc);

			if (softback_buf)