Skip to content

Commit

Permalink
[PATCH] ARM: Acornfb: Don't claim IRQ fbcon for cursor
Browse files Browse the repository at this point in the history
The generic fbcon code tries to register and use the vsync IRQ for
ARM platforms with acornfb, but forgets to disable its own cursor
timer.  The result is a flickering flashing cursor.

Remove the code from the fbcon core to register this platform
private interrupt.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Russell King authored and Russell King committed Jun 30, 2005
1 parent cfb0810 commit 41359dc
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions drivers/video/console/fbcon.c
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,6 @@ static int fbcon_set_origin(struct vc_data *);
#define CURSOR_DRAW_DELAY (1)

/* # VBL ints between cursor state changes */
#define ARM_CURSOR_BLINK_RATE (10)
#define ATARI_CURSOR_BLINK_RATE (42)
#define MAC_CURSOR_BLINK_RATE (32)
#define DEFAULT_CURSOR_BLINK_RATE (20)
Expand Down Expand Up @@ -288,7 +287,7 @@ static void fb_flashcursor(void *private)
release_console_sem();
}

#if (defined(__arm__) && defined(IRQ_VSYNCPULSE)) || defined(CONFIG_ATARI) || defined(CONFIG_MAC)
#if defined(CONFIG_ATARI) || defined(CONFIG_MAC)
static int cursor_blink_rate;
static irqreturn_t fb_vbl_handler(int irq, void *dev_id, struct pt_regs *fp)
{
Expand Down Expand Up @@ -878,11 +877,6 @@ static const char *fbcon_startup(void)
}
#endif /* CONFIG_MAC */

#if defined(__arm__) && defined(IRQ_VSYNCPULSE)
cursor_blink_rate = ARM_CURSOR_BLINK_RATE;
irqres = request_irq(IRQ_VSYNCPULSE, fb_vbl_handler, SA_SHIRQ,
"framebuffer vbl", info);
#endif
/* Initialize the work queue. If the driver provides its
* own work queue this means it will use something besides
* default timer to flash the cursor. */
Expand Down

0 comments on commit 41359dc

Please sign in to comment.