瀏覽代碼

fbcon: don't draw cursor when it's disabled

When the cursor and echo are disabled on the current console, pressing a
key will cause a black rectangle to be painted in the cursor's position.
Fix this by not touching the framebuffer in fbcon_cursor() when the
cursor is off.

Signed-off-by: Michal Januszewski <spock@gentoo.org>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Michal Januszewski 18 年之前
父節點
當前提交
d1e2306681
共有 1 個文件被更改,包括 1 次插入1 次删除
  1. 1 1
      drivers/video/console/fbcon.c

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

@@ -1310,7 +1310,7 @@ static void fbcon_cursor(struct vc_data *vc, int mode)
 	int y;
 	int y;
  	int c = scr_readw((u16 *) vc->vc_pos);
  	int c = scr_readw((u16 *) vc->vc_pos);
 
 
-	if (fbcon_is_inactive(vc, info))
+	if (fbcon_is_inactive(vc, info) || vc->vc_deccm != 1)
 		return;
 		return;
 
 
 	ops->cursor_flash = (mode == CM_ERASE) ? 0 : 1;
 	ops->cursor_flash = (mode == CM_ERASE) ? 0 : 1;