Commit 217cb07b authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

fbcon: Move fbcon callbacks into struct fbcon_bitops 



Depending on rotation settings, fbcon sets different callback
functions in struct fbcon_par from within fbcon_set_bitops(). Declare
the callback functions in the new type struct fbcon_bitops. Then
only replace the single bitops pointer in struct fbcon_par.

Keeping callbacks in constant instances of struct fbcon_bitops
makes it harder to exploit the callbacks. Also makes the code slightly
easier to maintain.

For tile-based consoles, there's a separate instance of the bitops
structure.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarSam Ravnborg <sam@ravnborg.org>
Link: https://lore.kernel.org/r/20250909124616.143365-5-tzimmermann@suse.de
parent 9cfd0940

drivers/video/fbdev/core/bitblit.c

+10 −7
Original line number Diff line number Diff line
@@ -384,15 +384,18 @@ static int bit_update_start(struct fb_info *info) 
	return err;

}



static const struct fbcon_bitops bit_fbcon_bitops = {

	.bmove = bit_bmove,

	.clear = bit_clear,

	.putcs = bit_putcs,

	.clear_margins = bit_clear_margins,

	.cursor = bit_cursor,

	.update_start = bit_update_start,

};



void fbcon_set_bitops(struct fbcon_par *par)

{

	par->bmove = bit_bmove;

	par->clear = bit_clear;

	par->putcs = bit_putcs;

	par->clear_margins = bit_clear_margins;

	par->cursor = bit_cursor;

	par->update_start = bit_update_start;

	par->rotate_font = NULL;

	par->bitops = &bit_fbcon_bitops;



	if (par->rotate)

		fbcon_set_rotate(par);

drivers/video/fbdev/core/fbcon.c

+35 −32
Original line number Diff line number Diff line
@@ -405,7 +405,7 @@ static void fb_flashcursor(struct work_struct *work) 


	c = scr_readw((u16 *) vc->vc_pos);

	enable = par->cursor_flash && !par->cursor_state.enable;

	par->cursor(vc, info, enable,

	par->bitops->cursor(vc, info, enable,

			    get_fg_color(vc, info, c),

			    get_bg_color(vc, info, c));

	console_unlock();
@@ -1162,7 +1162,7 @@ static void fbcon_init(struct vc_data *vc, bool init) 
	if (logo)

		fbcon_prepare_logo(vc, info, cols, rows, new_cols, new_rows);



	if (par->rotate_font && par->rotate_font(info, vc)) {

	if (par->bitops->rotate_font && par->bitops->rotate_font(info, vc)) {

		par->rotate = FB_ROTATE_UR;

		set_blitting_type(vc, info);

	}
@@ -1303,10 +1303,11 @@ static void __fbcon_clear(struct vc_data *vc, unsigned int sy, unsigned int sx, 
	y_break = p->vrows - p->yscroll;

	if (sy < y_break && sy + height - 1 >= y_break) {

		u_int b = y_break - sy;

		par->clear(vc, info, real_y(p, sy), sx, b, width, fg, bg);

		par->clear(vc, info, real_y(p, sy + b), sx, height - b, width, fg, bg);

		par->bitops->clear(vc, info, real_y(p, sy), sx, b, width, fg, bg);

		par->bitops->clear(vc, info, real_y(p, sy + b), sx, height - b,

				     width, fg, bg);

	} else

		par->clear(vc, info, real_y(p, sy), sx, height, width, fg, bg);

		par->bitops->clear(vc, info, real_y(p, sy), sx, height, width, fg, bg);

}



static void fbcon_clear(struct vc_data *vc, unsigned int sy, unsigned int sx,
@@ -1323,7 +1324,7 @@ static void fbcon_putcs(struct vc_data *vc, const u16 *s, unsigned int count, 
	struct fbcon_par *par = info->fbcon_par;



	if (fbcon_is_active(vc, info))

		par->putcs(vc, info, s, count, real_y(p, ypos), xpos,

		par->bitops->putcs(vc, info, s, count, real_y(p, ypos), xpos,

				   get_fg_color(vc, info, scr_readw(s)),

				   get_bg_color(vc, info, scr_readw(s)));

}
@@ -1334,7 +1335,7 @@ static void fbcon_clear_margins(struct vc_data *vc, int bottom_only) 
	struct fbcon_par *par = info->fbcon_par;



	if (fbcon_is_active(vc, info))

		par->clear_margins(vc, info, margin_color, bottom_only);

		par->bitops->clear_margins(vc, info, margin_color, bottom_only);

}



static void fbcon_cursor(struct vc_data *vc, bool enable)
@@ -1355,10 +1356,10 @@ static void fbcon_cursor(struct vc_data *vc, bool enable) 


	par->cursor_flash = enable;



	if (!par->cursor)

	if (!par->bitops->cursor)

		return;



	par->cursor(vc, info, enable,

	par->bitops->cursor(vc, info, enable,

			    get_fg_color(vc, info, c),

			    get_bg_color(vc, info, c));

}
@@ -1444,7 +1445,7 @@ static __inline__ void ywrap_up(struct vc_data *vc, int count) 
	par->var.xoffset = 0;

	par->var.yoffset = p->yscroll * vc->vc_font.height;

	par->var.vmode |= FB_VMODE_YWRAP;

	par->update_start(info);

	par->bitops->update_start(info);

	scrollback_max += count;

	if (scrollback_max > scrollback_phys_max)

		scrollback_max = scrollback_phys_max;
@@ -1463,7 +1464,7 @@ static __inline__ void ywrap_down(struct vc_data *vc, int count) 
	par->var.xoffset = 0;

	par->var.yoffset = p->yscroll * vc->vc_font.height;

	par->var.vmode |= FB_VMODE_YWRAP;

	par->update_start(info);

	par->bitops->update_start(info);

	scrollback_max -= count;

	if (scrollback_max < 0)

		scrollback_max = 0;
@@ -1478,7 +1479,7 @@ static __inline__ void ypan_up(struct vc_data *vc, int count) 


	p->yscroll += count;

	if (p->yscroll > p->vrows - vc->vc_rows) {

		par->bmove(vc, info, p->vrows - vc->vc_rows,

		par->bitops->bmove(vc, info, p->vrows - vc->vc_rows,

				   0, 0, 0, vc->vc_rows, vc->vc_cols);

		p->yscroll -= p->vrows - vc->vc_rows;

	}
@@ -1486,7 +1487,7 @@ static __inline__ void ypan_up(struct vc_data *vc, int count) 
	par->var.xoffset = 0;

	par->var.yoffset = p->yscroll * vc->vc_font.height;

	par->var.vmode &= ~FB_VMODE_YWRAP;

	par->update_start(info);

	par->bitops->update_start(info);

	fbcon_clear_margins(vc, 1);

	scrollback_max += count;

	if (scrollback_max > scrollback_phys_max)
@@ -1510,7 +1511,7 @@ static __inline__ void ypan_up_redraw(struct vc_data *vc, int t, int count) 
	par->var.xoffset = 0;

	par->var.yoffset = p->yscroll * vc->vc_font.height;

	par->var.vmode &= ~FB_VMODE_YWRAP;

	par->update_start(info);

	par->bitops->update_start(info);

	fbcon_clear_margins(vc, 1);

	scrollback_max += count;

	if (scrollback_max > scrollback_phys_max)
@@ -1526,7 +1527,7 @@ static __inline__ void ypan_down(struct vc_data *vc, int count) 


	p->yscroll -= count;

	if (p->yscroll < 0) {

		par->bmove(vc, info, 0, 0, p->vrows - vc->vc_rows,

		par->bitops->bmove(vc, info, 0, 0, p->vrows - vc->vc_rows,

				   0, vc->vc_rows, vc->vc_cols);

		p->yscroll += p->vrows - vc->vc_rows;

	}
@@ -1534,7 +1535,7 @@ static __inline__ void ypan_down(struct vc_data *vc, int count) 
	par->var.xoffset = 0;

	par->var.yoffset = p->yscroll * vc->vc_font.height;

	par->var.vmode &= ~FB_VMODE_YWRAP;

	par->update_start(info);

	par->bitops->update_start(info);

	fbcon_clear_margins(vc, 1);

	scrollback_max -= count;

	if (scrollback_max < 0)
@@ -1558,7 +1559,7 @@ static __inline__ void ypan_down_redraw(struct vc_data *vc, int t, int count) 
	par->var.xoffset = 0;

	par->var.yoffset = p->yscroll * vc->vc_font.height;

	par->var.vmode &= ~FB_VMODE_YWRAP;

	par->update_start(info);

	par->bitops->update_start(info);

	fbcon_clear_margins(vc, 1);

	scrollback_max -= count;

	if (scrollback_max < 0)
@@ -1620,7 +1621,7 @@ static void fbcon_redraw_blit(struct vc_data *vc, struct fb_info *info, 


			if (c == scr_readw(d)) {

				if (s > start) {

					par->bmove(vc, info, line + ycount, x,

					par->bitops->bmove(vc, info, line + ycount, x,

							   line, x, 1, s - start);

					x += s - start + 1;

					start = s + 1;
@@ -1636,7 +1637,8 @@ static void fbcon_redraw_blit(struct vc_data *vc, struct fb_info *info, 
			d++;

		} while (s < le);

		if (s > start)

			par->bmove(vc, info, line + ycount, x, line, x, 1, s - start);

			par->bitops->bmove(vc, info, line + ycount, x, line, x, 1,

					     s - start);

		console_conditional_schedule();

		if (ycount > 0)

			line++;
@@ -1741,7 +1743,8 @@ static void fbcon_bmove_rec(struct vc_data *vc, struct fbcon_display *p, int sy, 
		}

		return;

	}

	par->bmove(vc, info, real_y(p, sy), sx, real_y(p, dy), dx, height, width);

	par->bitops->bmove(vc, info, real_y(p, sy), sx, real_y(p, dy), dx,

			     height, width);

}



static void fbcon_bmove(struct vc_data *vc, int sy, int sx, int dy, int dx,
@@ -2161,7 +2164,7 @@ static bool fbcon_switch(struct vc_data *vc) 
	set_blitting_type(vc, info);

	par->cursor_reset = 1;



	if (par->rotate_font && par->rotate_font(info, vc)) {

	if (par->bitops->rotate_font && par->bitops->rotate_font(info, vc)) {

		par->rotate = FB_ROTATE_UR;

		set_blitting_type(vc, info);

	}
@@ -2194,7 +2197,7 @@ static bool fbcon_switch(struct vc_data *vc) 


	if (fbcon_is_active(vc, info)) {

		par->var.xoffset = par->var.yoffset = p->yscroll = 0;

		par->update_start(info);

		par->bitops->update_start(info);

	}



	fbcon_set_palette(vc, color_table);
@@ -2693,7 +2696,7 @@ static void fbcon_modechanged(struct fb_info *info) 


		if (fbcon_is_active(vc, info)) {

			par->var.xoffset = par->var.yoffset = p->yscroll = 0;

			par->update_start(info);

			par->bitops->update_start(info);

		}



		fbcon_set_palette(vc, color_table);

drivers/video/fbdev/core/fbcon.h

+6 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ struct fbcon_display { 
    const struct fb_videomode *mode;

};



struct fbcon_par {

struct fbcon_bitops {

	void (*bmove)(struct vc_data *vc, struct fb_info *info, int sy,

		      int sx, int dy, int dx, int height, int width);

	void (*clear)(struct vc_data *vc, struct fb_info *info, int sy,
@@ -65,6 +65,9 @@ struct fbcon_par { 
		       bool enable, int fg, int bg);

	int  (*update_start)(struct fb_info *info);

	int  (*rotate_font)(struct fb_info *info, struct vc_data *vc);

};



struct fbcon_par {

	struct fb_var_screeninfo var;  /* copy of the current fb_var_screeninfo */

	struct delayed_work cursor_work; /* Cursor timer */

	struct fb_cursor cursor_state;
@@ -86,6 +89,8 @@ struct fbcon_par { 
	u8    *cursor_src;

	u32    cursor_size;

	u32    fd_size;



	const struct fbcon_bitops *bitops;

};



    /*

drivers/video/fbdev/core/fbcon_ccw.c

+11 −7
Original line number Diff line number Diff line
@@ -390,13 +390,17 @@ static int ccw_update_start(struct fb_info *info) 
	return err;

}



static const struct fbcon_bitops ccw_fbcon_bitops = {

	.bmove = ccw_bmove,

	.clear = ccw_clear,

	.putcs = ccw_putcs,

	.clear_margins = ccw_clear_margins,

	.cursor = ccw_cursor,

	.update_start = ccw_update_start,

	.rotate_font = fbcon_rotate_font,

};



void fbcon_rotate_ccw(struct fbcon_par *par)

{

	par->bmove = ccw_bmove;

	par->clear = ccw_clear;

	par->putcs = ccw_putcs;

	par->clear_margins = ccw_clear_margins;

	par->cursor = ccw_cursor;

	par->update_start = ccw_update_start;

	par->rotate_font = fbcon_rotate_font;

	par->bitops = &ccw_fbcon_bitops;

}

drivers/video/fbdev/core/fbcon_cw.c

+11 −7
Original line number Diff line number Diff line
@@ -373,13 +373,17 @@ static int cw_update_start(struct fb_info *info) 
	return err;

}



static const struct fbcon_bitops cw_fbcon_bitops = {

	.bmove = cw_bmove,

	.clear = cw_clear,

	.putcs = cw_putcs,

	.clear_margins = cw_clear_margins,

	.cursor = cw_cursor,

	.update_start = cw_update_start,

	.rotate_font = fbcon_rotate_font,

};



void fbcon_rotate_cw(struct fbcon_par *par)

{

	par->bmove = cw_bmove;

	par->clear = cw_clear;

	par->putcs = cw_putcs;

	par->clear_margins = cw_clear_margins;

	par->cursor = cw_cursor;

	par->update_start = cw_update_start;

	par->rotate_font = fbcon_rotate_font;

	par->bitops = &cw_fbcon_bitops;

}