From c64de43fd37c093c24cf8213078713178c63734b Mon Sep 17 00:00:00 2001 From: "Antonino A. Daplas" Date: Mon, 12 Dec 2005 22:17:18 -0800 Subject: [PATCH] --- yaml --- r: 15103 b: refs/heads/master c: 4e1567d3aad9bae0ecc5bb047179cd026bfb035c h: refs/heads/master i: 15101: 2ad7efe76d335553feb65257b055caa4ae79fe17 15099: 3eea8e8e9a57756f76beb3dc5653006ffbb355ca 15095: 3032e57139a070cdbac413c0f7ed4f8525155841 15087: b305b3e19676fa079c3013c02cbc0c22b8e9362f 15071: 5946427ca9f2e8885995562d0f604b739be8376b 15039: 42303fc8d9abd0a082d937c36d0e2bf3b5c3a873 14975: fb6151ed359c11646e35660ed0dfda2292e79b8f 14847: 92d0216f28c7d55d581d98ede6b6a795bcfca9a3 v: v3 --- [refs] | 2 +- trunk/drivers/video/console/fbcon.c | 25 +++++++++++++++++++------ 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index aab58a3b51bf..6cc0fa20f783 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1207069f6f8f3d1b71641fdaa6cc04fca6fff9f5 +refs/heads/master: 4e1567d3aad9bae0ecc5bb047179cd026bfb035c diff --git a/trunk/drivers/video/console/fbcon.c b/trunk/drivers/video/console/fbcon.c index bd4500a8992e..8068d2f7efe6 100644 --- a/trunk/drivers/video/console/fbcon.c +++ b/trunk/drivers/video/console/fbcon.c @@ -2146,8 +2146,12 @@ static int fbcon_switch(struct vc_data *vc) scrollback_max = 0; scrollback_current = 0; - ops->var.xoffset = ops->var.yoffset = p->yscroll = 0; - ops->update_start(info); + + 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; - ops->var.xoffset = ops->var.yoffset = p->yscroll = 0; - ops->update_start(info); + + 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; - ops->update_start(info); + + 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)