Commit fb121c4a authored by James Simmons's avatar James Simmons

Cleaned up the console blank handling.

parent 1569953a
...@@ -302,13 +302,10 @@ void gen_set_disp(int con, struct fb_info *info) ...@@ -302,13 +302,10 @@ void gen_set_disp(int con, struct fb_info *info)
struct display *display = fb_display + con; struct display *display = fb_display + con;
if (info->fix.visual == FB_VISUAL_PSEUDOCOLOR || if (info->fix.visual == FB_VISUAL_PSEUDOCOLOR ||
info->fix.visual == FB_VISUAL_DIRECTCOLOR) { info->fix.visual == FB_VISUAL_DIRECTCOLOR)
display->can_soft_blank = info->fbops->fb_blank ? 1 : 0;
display->dispsw_data = NULL; display->dispsw_data = NULL;
} else { else
display->can_soft_blank = 0;
display->dispsw_data = info->pseudo_palette; display->dispsw_data = info->pseudo_palette;
}
/* /*
* If we are setting all the virtual consoles, also set * If we are setting all the virtual consoles, also set
...@@ -323,6 +320,7 @@ void gen_set_disp(int con, struct fb_info *info) ...@@ -323,6 +320,7 @@ void gen_set_disp(int con, struct fb_info *info)
} }
*/ */
display->can_soft_blank = info->fbops->fb_blank ? 1 : 0;
#ifdef FBCON_HAS_ACCEL #ifdef FBCON_HAS_ACCEL
display->scrollmode = SCROLL_YNOMOVE; display->scrollmode = SCROLL_YNOMOVE;
display->dispsw = &fbcon_accel; display->dispsw = &fbcon_accel;
......
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