Commit 8b197698 authored by Antonino Daplas's avatar Antonino Daplas Committed by Linus Torvalds

[PATCH] fbcon: Catch blank events on both device and console level

Call fb_blank() instead of info->fbops->fb_blank() to capture events on both
device and console level.
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 76e7709a
......@@ -2014,6 +2014,7 @@ static void fbcon_generic_blank(struct vc_data *vc, struct fb_info *info,
static int fbcon_blank(struct vc_data *vc, int blank, int mode_switch)
{
struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];
struct fbcon_ops *ops = info->fbcon_par;
int active = !fbcon_is_inactive(vc, info);
if (mode_switch) {
......@@ -2037,18 +2038,14 @@ static int fbcon_blank(struct vc_data *vc, int blank, int mode_switch)
}
if (active) {
struct fbcon_ops *ops = info->fbcon_par;
fbcon_cursor(vc, blank ? CM_ERASE : CM_DRAW);
ops->cursor_flash = (!blank);
if (ops->blank_state != blank) {
if (info->fbops->fb_blank &&
info->fbops->fb_blank(blank, info))
fbcon_generic_blank(vc, info, blank);
if (ops->blank_state != blank) {
ops->blank_state = blank;
fbcon_cursor(vc, blank ? CM_ERASE : CM_DRAW);
ops->cursor_flash = (!blank);
ops->blank_state = blank;
}
if (fb_blank(info, blank))
fbcon_generic_blank(vc, info, blank);
}
if (!blank)
update_screen(vc->vc_num);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment