浏览代码

fbcon: fix wrong vmode bits copied on console switch

The interlaced and double line mode bits should not be copied to new
console when the console is switched.  Otherwise, the new console may be
set to incorrect refresh rate.

Also, the x and y offsets does not need to be copied.

Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Krzysztof Helt 17 年之前
父节点
当前提交
10732c35df
共有 1 个文件被更改,包括 1 次插入3 次删除
  1. 1 3
      drivers/video/console/fbcon.c

+ 1 - 3
drivers/video/console/fbcon.c

@@ -2275,9 +2275,7 @@ static int fbcon_switch(struct vc_data *vc)
 	 * in fb_set_var()
 	 * in fb_set_var()
 	 */
 	 */
 	info->var.activate = var.activate;
 	info->var.activate = var.activate;
-	var.yoffset = info->var.yoffset;
-	var.xoffset = info->var.xoffset;
-	var.vmode = info->var.vmode;
+	var.vmode |= info->var.vmode & ~FB_VMODE_MASK;
 	fb_set_var(info, &var);
 	fb_set_var(info, &var);
 	ops->var = info->var;
 	ops->var = info->var;