iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[PATCH] fbcon: Stop cursor timer if console is inactive

Browse Source 
If console is blanked or in KD_GRAPHICS mode, delete cursor timer.  No sense
flashing the cursor when there's nothing to be seen.

Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Antonino A. Daplas 2005-09-09 13:10:00 -07:00 committed by Linus Torvalds
parent c52890cc36
commit 88fb2c6efb
2 changed files with 52 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
drivers/video/console/fbcon.c
View File

@ -331,6 +331,35 @@ static void cursor_timer_handler(unsigned long dev_addr)
mod_timer(&ops->cursor_timer, jiffies + HZ/5); mod_timer(&ops->cursor_timer, jiffies + HZ/5);
} }
static void fbcon_add_cursor_timer(struct fb_info *info)
{
struct fbcon_ops *ops = info->fbcon_par;
if ((!info->queue.func || info->queue.func == fb_flashcursor) &&
!(ops->flags & FBCON_FLAGS_CURSOR_TIMER)) {
if (!info->queue.func)
INIT_WORK(&info->queue, fb_flashcursor, info);
init_timer(&ops->cursor_timer);
ops->cursor_timer.function = cursor_timer_handler;
ops->cursor_timer.expires = jiffies + HZ / 5;
ops->cursor_timer.data = (unsigned long ) info;
add_timer(&ops->cursor_timer);
ops->flags |= FBCON_FLAGS_CURSOR_TIMER;
}
}
static void fbcon_del_cursor_timer(struct fb_info *info)
{
struct fbcon_ops *ops = info->fbcon_par;
if (info->queue.func == fb_flashcursor &&
ops->flags & FBCON_FLAGS_CURSOR_TIMER) {
del_timer_sync(&ops->cursor_timer);
ops->flags &= ~FBCON_FLAGS_CURSOR_TIMER;
}
}
#ifndef MODULE #ifndef MODULE
static int __init fb_console_setup(char *this_opt) static int __init fb_console_setup(char *this_opt)
{ {
@ -583,9 +612,7 @@ static int con2fb_release_oldinfo(struct vc_data *vc, struct fb_info *oldinfo,
} }
if (!err) { if (!err) {
if (oldinfo->queue.func == fb_flashcursor) fbcon_del_cursor_timer(oldinfo);
del_timer_sync(&ops->cursor_timer);
kfree(ops->cursor_state.mask); kfree(ops->cursor_state.mask);
kfree(ops->cursor_data); kfree(ops->cursor_data);
kfree(oldinfo->fbcon_par); kfree(oldinfo->fbcon_par);
@ -596,22 +623,6 @@ static int con2fb_release_oldinfo(struct vc_data *vc, struct fb_info *oldinfo,
return err; return err;
} }
static void con2fb_init_newinfo(struct fb_info *info)
{
if (!info->queue.func || info->queue.func == fb_flashcursor) {
struct fbcon_ops *ops = info->fbcon_par;
if (!info->queue.func)
INIT_WORK(&info->queue, fb_flashcursor, info);
init_timer(&ops->cursor_timer);
ops->cursor_timer.function = cursor_timer_handler;
ops->cursor_timer.expires = jiffies + HZ / 5;
ops->cursor_timer.data = (unsigned long ) info;
add_timer(&ops->cursor_timer);
}
}
static void con2fb_init_display(struct vc_data *vc, struct fb_info *info, static void con2fb_init_display(struct vc_data *vc, struct fb_info *info,
int unit, int show_logo) int unit, int show_logo)
{ {
@ -695,7 +706,7 @@ static int set_con2fb_map(int unit, int newidx, int user)
logo_shown != FBCON_LOGO_DONTSHOW); logo_shown != FBCON_LOGO_DONTSHOW);
if (!found) if (!found)
con2fb_init_newinfo(info); fbcon_add_cursor_timer(info);
con2fb_map_boot[unit] = newidx; con2fb_map_boot[unit] = newidx;
con2fb_init_display(vc, info, unit, show_logo); con2fb_init_display(vc, info, unit, show_logo);
} }
@ -898,18 +909,7 @@ static const char *fbcon_startup(void)
} }
#endif /* CONFIG_MAC */ #endif /* CONFIG_MAC */
/* Initialize the work queue. If the driver provides its fbcon_add_cursor_timer(info);
* own work queue this means it will use something besides
* default timer to flash the cursor. */
if (!info->queue.func) {
INIT_WORK(&info->queue, fb_flashcursor, info);
init_timer(&ops->cursor_timer);
ops->cursor_timer.function = cursor_timer_handler;
ops->cursor_timer.expires = jiffies + HZ / 5;
ops->cursor_timer.data = (unsigned long ) info;
add_timer(&ops->cursor_timer);
}
return display_desc; return display_desc;
} }
@ -1923,7 +1923,7 @@ static int fbcon_resize(struct vc_data *vc, unsigned int width,
static int fbcon_switch(struct vc_data *vc) static int fbcon_switch(struct vc_data *vc)
{ {
struct fb_info *info; struct fb_info *info, *old_info = NULL;
struct display *p = &fb_display[vc->vc_num]; struct display *p = &fb_display[vc->vc_num];
struct fb_var_screeninfo var; struct fb_var_screeninfo var;
int i, prev_console; int i, prev_console;
@ -1956,7 +1956,8 @@ static int fbcon_switch(struct vc_data *vc)
} }
prev_console = ((struct fbcon_ops *)info->fbcon_par)->currcon; prev_console = ((struct fbcon_ops *)info->fbcon_par)->currcon;
if (prev_console != -1)
old_info = registered_fb[con2fb_map[prev_console]];
/* /*
* FIXME: If we have multiple fbdev's loaded, we need to * FIXME: If we have multiple fbdev's loaded, we need to
* update all info->currcon. Perhaps, we can place this * update all info->currcon. Perhaps, we can place this
@ -1984,10 +1985,12 @@ static int fbcon_switch(struct vc_data *vc)
info->var.yoffset = info->var.xoffset = p->yscroll = 0; info->var.yoffset = info->var.xoffset = p->yscroll = 0;
fb_set_var(info, &var); fb_set_var(info, &var);
if (prev_console != -1 && if (old_info != NULL && old_info != info) {
registered_fb[con2fb_map[prev_console]] != info && if (info->fbops->fb_set_par)
info->fbops->fb_set_par) info->fbops->fb_set_par(info);
info->fbops->fb_set_par(info); fbcon_del_cursor_timer(old_info);
fbcon_add_cursor_timer(info);
}
set_blitting_type(vc, info, p); set_blitting_type(vc, info, p);
((struct fbcon_ops *)info->fbcon_par)->cursor_reset = 1; ((struct fbcon_ops *)info->fbcon_par)->cursor_reset = 1;
@ -2073,11 +2076,16 @@ static int fbcon_blank(struct vc_data *vc, int blank, int mode_switch)
fbcon_generic_blank(vc, info, blank); fbcon_generic_blank(vc, info, blank);
} }
if (!blank) if (!blank)
update_screen(vc); update_screen(vc);
} }
return 0; if (!blank)
fbcon_add_cursor_timer(info);
else
fbcon_del_cursor_timer(info);
return 0;
} }
static void fbcon_free_font(struct display *p) static void fbcon_free_font(struct display *p)

3
drivers/video/console/fbcon.h
View File

@ -18,7 +18,8 @@
#include <asm/io.h> #include <asm/io.h>
#define FBCON_FLAGS_INIT 1 #define FBCON_FLAGS_INIT 1
#define FBCON_FLAGS_CURSOR_TIMER 2
/* /*
* This is the interface between the low-level console driver and the * This is the interface between the low-level console driver and the