diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2008-12-30 08:11:23 -0500 |
---|---|---|
committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2009-01-12 14:56:43 -0500 |
commit | 1fa0b29f3a43f9dd8080d24cd16790b15ef963f5 (patch) | |
tree | ffb154444dbf00ca6bc9075f075b834963d87a90 /drivers/video/console | |
parent | b01e3b07ec29e98464a4f580ae000291cf0d2f87 (diff) |
fbdev: Kill Atari vblank cursor blinking
Kill the last remaining vblank cursor blinking user
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'drivers/video/console')
-rw-r--r-- | drivers/video/console/fbcon.c | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c index 4bcff81b50e0..1657b9608b04 100644 --- a/drivers/video/console/fbcon.c +++ b/drivers/video/console/fbcon.c | |||
@@ -78,13 +78,6 @@ | |||
78 | #include <asm/fb.h> | 78 | #include <asm/fb.h> |
79 | #include <asm/irq.h> | 79 | #include <asm/irq.h> |
80 | #include <asm/system.h> | 80 | #include <asm/system.h> |
81 | #ifdef CONFIG_ATARI | ||
82 | #include <asm/atariints.h> | ||
83 | #endif | ||
84 | #if defined(__mc68000__) | ||
85 | #include <asm/machdep.h> | ||
86 | #include <asm/setup.h> | ||
87 | #endif | ||
88 | 81 | ||
89 | #include "fbcon.h" | 82 | #include "fbcon.h" |
90 | 83 | ||
@@ -155,9 +148,6 @@ static int fbcon_set_origin(struct vc_data *); | |||
155 | 148 | ||
156 | #define CURSOR_DRAW_DELAY (1) | 149 | #define CURSOR_DRAW_DELAY (1) |
157 | 150 | ||
158 | /* # VBL ints between cursor state changes */ | ||
159 | #define ATARI_CURSOR_BLINK_RATE (42) | ||
160 | |||
161 | static int vbl_cursor_cnt; | 151 | static int vbl_cursor_cnt; |
162 | static int fbcon_cursor_noblink; | 152 | static int fbcon_cursor_noblink; |
163 | 153 | ||
@@ -403,20 +393,6 @@ static void fb_flashcursor(struct work_struct *work) | |||
403 | release_console_sem(); | 393 | release_console_sem(); |
404 | } | 394 | } |
405 | 395 | ||
406 | #ifdef CONFIG_ATARI | ||
407 | static int cursor_blink_rate; | ||
408 | static irqreturn_t fb_vbl_handler(int irq, void *dev_id) | ||
409 | { | ||
410 | struct fb_info *info = dev_id; | ||
411 | |||
412 | if (vbl_cursor_cnt && --vbl_cursor_cnt == 0) { | ||
413 | schedule_work(&info->queue); | ||
414 | vbl_cursor_cnt = cursor_blink_rate; | ||
415 | } | ||
416 | return IRQ_HANDLED; | ||
417 | } | ||
418 | #endif | ||
419 | |||
420 | static void cursor_timer_handler(unsigned long dev_addr) | 396 | static void cursor_timer_handler(unsigned long dev_addr) |
421 | { | 397 | { |
422 | struct fb_info *info = (struct fb_info *) dev_addr; | 398 | struct fb_info *info = (struct fb_info *) dev_addr; |
@@ -1017,15 +993,6 @@ static const char *fbcon_startup(void) | |||
1017 | info->var.yres, | 993 | info->var.yres, |
1018 | info->var.bits_per_pixel); | 994 | info->var.bits_per_pixel); |
1019 | 995 | ||
1020 | #ifdef CONFIG_ATARI | ||
1021 | if (MACH_IS_ATARI) { | ||
1022 | cursor_blink_rate = ATARI_CURSOR_BLINK_RATE; | ||
1023 | (void)request_irq(IRQ_AUTO_4, fb_vbl_handler, | ||
1024 | IRQ_TYPE_PRIO, "framebuffer vbl", | ||
1025 | info); | ||
1026 | } | ||
1027 | #endif /* CONFIG_ATARI */ | ||
1028 | |||
1029 | fbcon_add_cursor_timer(info); | 996 | fbcon_add_cursor_timer(info); |
1030 | fbcon_has_exited = 0; | 997 | fbcon_has_exited = 0; |
1031 | return display_desc; | 998 | return display_desc; |
@@ -3454,11 +3421,6 @@ static void fbcon_exit(void) | |||
3454 | if (fbcon_has_exited) | 3421 | if (fbcon_has_exited) |
3455 | return; | 3422 | return; |
3456 | 3423 | ||
3457 | #ifdef CONFIG_ATARI | ||
3458 | if (MACH_IS_ATARI) | ||
3459 | free_irq(IRQ_AUTO_4, fb_vbl_handler); | ||
3460 | #endif | ||
3461 | |||
3462 | kfree((void *)softback_buf); | 3424 | kfree((void *)softback_buf); |
3463 | softback_buf = 0UL; | 3425 | softback_buf = 0UL; |
3464 | 3426 | ||