Attachment #56111 for bug #88883




}

static void bit_cursor(struct vc_data *vc, struct fb_info *info,
		       struct display *p, int mode, int fg, int bg,
		       int softback_lines)
{
	struct fb_cursor cursor;
	struct fbcon_ops *ops = (struct fbcon_ops *) info->fbcon_par;
	unsigned short charmask = vc->vc_hi_font_mask ? 0x1ff : 0xff;
	int w = (vc->vc_font.width + 7) >> 3, c;
	int y = real_y(p, vc->vc_y) + softback_lines;
	int attribute, use_sw = (vc->vc_cursor_type & 0x10);
	char *src;


Lines 279-285 Link Here

(-)linux-2.6.11-gentoo-r4.orig/drivers/video/console/fbcon.c (-2 / +2 lines)
279	mode = (!ops->cursor_flash \|\| ops->cursor_state.enable) ?	279	mode = (!ops->cursor_flash \|\| ops->cursor_state.enable) ?
280	CM_ERASE : CM_DRAW;	280	CM_ERASE : CM_DRAW;
281	ops->cursor(vc, info, p, mode, get_color(vc, info, c, 1),	281	ops->cursor(vc, info, p, mode, get_color(vc, info, c, 1),
282	get_color(vc, info, c, 0));	282	get_color(vc, info, c, 0), softback_lines);
283		283
284	release_console_sem();	284	release_console_sem();
285	}	285	}
Lines 1133-1139 Link Here
1133	fbcon_set_origin(vc);	1133	fbcon_set_origin(vc);
1134		1134
1135	ops->cursor(vc, info, p, mode, get_color(vc, info, c, 1),	1135	ops->cursor(vc, info, p, mode, get_color(vc, info, c, 1),
1136	get_color(vc, info, c, 0));	1136	get_color(vc, info, c, 0), softback_lines);
1137	vbl_cursor_cnt = CURSOR_DRAW_DELAY;	1137	vbl_cursor_cnt = CURSOR_DRAW_DELAY;
1138	}	1138	}
1139		1139

Lines 59-65 Link Here

(-)linux-2.6.11-gentoo-r4.orig/drivers/video/console/fbcon.h (-1 / +2 lines)
59	void (clear_margins)(struct vc_data vc, struct fb_info *info,	59	void (clear_margins)(struct vc_data vc, struct fb_info *info,
60	int bottom_only);	60	int bottom_only);
61	void (cursor)(struct vc_data vc, struct fb_info *info,	61	void (cursor)(struct vc_data vc, struct fb_info *info,
62	struct display *p, int mode, int fg, int bg);	62	struct display *p, int mode, int fg, int bg,
		63	int softback_lines);
63		64
64	struct timer_list cursor_timer; /* Cursor timer */	65	struct timer_list cursor_timer; /* Cursor timer */
65	struct fb_cursor cursor_state;	66	struct fb_cursor cursor_state;

Return to bug 88883

Lines 244-256 Link Here

(-)linux-2.6.11-gentoo-r4.orig/drivers/video/console/bitblit.c (-2 / +3 lines)
244	}	244	}
245		245
246	static void bit_cursor(struct vc_data vc, struct fb_info info,	246	static void bit_cursor(struct vc_data vc, struct fb_info info,
247	struct display *p, int mode, int fg, int bg)	247	struct display *p, int mode, int fg, int bg,
		248	int softback_lines)
248	{	249	{
249	struct fb_cursor cursor;	250	struct fb_cursor cursor;
250	struct fbcon_ops ops = (struct fbcon_ops ) info->fbcon_par;	251	struct fbcon_ops ops = (struct fbcon_ops ) info->fbcon_par;
251	unsigned short charmask = vc->vc_hi_font_mask ? 0x1ff : 0xff;	252	unsigned short charmask = vc->vc_hi_font_mask ? 0x1ff : 0xff;
252	int w = (vc->vc_font.width + 7) >> 3, c;	253	int w = (vc->vc_font.width + 7) >> 3, c;
253	int y = real_y(p, vc->vc_y);	254	int y = real_y(p, vc->vc_y) + softback_lines;
254	int attribute, use_sw = (vc->vc_cursor_type & 0x10);	255	int attribute, use_sw = (vc->vc_cursor_type & 0x10);
255	char *src;	256	char *src;
256		257