For user-provided fonts, the framebuffer layer is using a magic negative-indexing macro, FNTCHARCNT(), to keep track of their number of characters: #define FNTCHARCNT(fd) (((int *)(fd))[-3]) For built-in fonts, it is using hard-coded values (256). This results in something like the following: map.length = (ops->p->userfont) ? FNTCHARCNT(ops->p->fontdata) : 256; This is unsatisfactory. In fact, there is already a `charcount` field in our virtual console descriptor (see `struct console_font` inside `struct vc_data`), let us use it: map.length = vc->vc_font.charcount; Recently we added a `charcount` field to `struct font_desc`. Use it to set `vc->vc_font.charcount` properly. The idea is: - We only use FNTCHARCNT() on `vc->vc_font.data` and `p->fontdata`. Assume FNTCHARCNT() is working as intended; - Whenever `vc->vc_font.data` is set, also set `vc->vc_font.charcount` properly; - We can now replace `FNTCHARCNT(vc->vc_font.data)` with `vc->vc_font.charcount`; - Since `p->fontdata` always point to the same font data buffer with `vc->vc_font.data`, we can also replace `FNTCHARCNT(p->fontdata)` with `vc->vc_font.charcount`. In conclusion, set `vc->vc_font.charcount` properly in fbcon_startup(), fbcon_init(), fbcon_set_disp() and fbcon_do_set_font(), then replace FNTCHARCNT() with `vc->vc_font.charcount`. No more if-else between negative-indexing macros and hard-coded values. Do not include <linux/font.h> in fbcon_rotate.c and tileblit.c, since they no longer need it. Depends on patch "Fonts: Add charcount field to font_desc". Suggested-by: Daniel Vetter <daniel@ffwll.ch> Signed-off-by: Peilin Ye <yepeilin.cs@gmail.com> Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: https://patchwork.freedesktop.org/patch/msgid/e460a5780e54e3022661d5f09555144583b4cc59.1605169912.git.yepeilin.cs@gmail.com
154 lines
3.7 KiB
C
154 lines
3.7 KiB
C
/*
|
|
* linux/drivers/video/console/tileblit.c -- Tile Blitting Operation
|
|
*
|
|
* Copyright (C) 2004 Antonino Daplas <adaplas @pol.net>
|
|
*
|
|
* This file is subject to the terms and conditions of the GNU General Public
|
|
* License. See the file COPYING in the main directory of this archive for
|
|
* more details.
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/string.h>
|
|
#include <linux/fb.h>
|
|
#include <linux/vt_kern.h>
|
|
#include <linux/console.h>
|
|
#include <asm/types.h>
|
|
#include "fbcon.h"
|
|
|
|
static void tile_bmove(struct vc_data *vc, struct fb_info *info, int sy,
|
|
int sx, int dy, int dx, int height, int width)
|
|
{
|
|
struct fb_tilearea area;
|
|
|
|
area.sx = sx;
|
|
area.sy = sy;
|
|
area.dx = dx;
|
|
area.dy = dy;
|
|
area.height = height;
|
|
area.width = width;
|
|
|
|
info->tileops->fb_tilecopy(info, &area);
|
|
}
|
|
|
|
static void tile_clear(struct vc_data *vc, struct fb_info *info, int sy,
|
|
int sx, int height, int width)
|
|
{
|
|
struct fb_tilerect rect;
|
|
int bgshift = (vc->vc_hi_font_mask) ? 13 : 12;
|
|
int fgshift = (vc->vc_hi_font_mask) ? 9 : 8;
|
|
|
|
rect.index = vc->vc_video_erase_char &
|
|
((vc->vc_hi_font_mask) ? 0x1ff : 0xff);
|
|
rect.fg = attr_fgcol_ec(fgshift, vc, info);
|
|
rect.bg = attr_bgcol_ec(bgshift, vc, info);
|
|
rect.sx = sx;
|
|
rect.sy = sy;
|
|
rect.width = width;
|
|
rect.height = height;
|
|
rect.rop = ROP_COPY;
|
|
|
|
info->tileops->fb_tilefill(info, &rect);
|
|
}
|
|
|
|
static void tile_putcs(struct vc_data *vc, struct fb_info *info,
|
|
const unsigned short *s, int count, int yy, int xx,
|
|
int fg, int bg)
|
|
{
|
|
struct fb_tileblit blit;
|
|
unsigned short charmask = vc->vc_hi_font_mask ? 0x1ff : 0xff;
|
|
int size = sizeof(u32) * count, i;
|
|
|
|
blit.sx = xx;
|
|
blit.sy = yy;
|
|
blit.width = count;
|
|
blit.height = 1;
|
|
blit.fg = fg;
|
|
blit.bg = bg;
|
|
blit.length = count;
|
|
blit.indices = (u32 *) fb_get_buffer_offset(info, &info->pixmap, size);
|
|
for (i = 0; i < count; i++)
|
|
blit.indices[i] = (u32)(scr_readw(s++) & charmask);
|
|
|
|
info->tileops->fb_tileblit(info, &blit);
|
|
}
|
|
|
|
static void tile_clear_margins(struct vc_data *vc, struct fb_info *info,
|
|
int color, int bottom_only)
|
|
{
|
|
return;
|
|
}
|
|
|
|
static void tile_cursor(struct vc_data *vc, struct fb_info *info, int mode,
|
|
int fg, int bg)
|
|
{
|
|
struct fb_tilecursor cursor;
|
|
int use_sw = vc->vc_cursor_type & CUR_SW;
|
|
|
|
cursor.sx = vc->state.x;
|
|
cursor.sy = vc->state.y;
|
|
cursor.mode = (mode == CM_ERASE || use_sw) ? 0 : 1;
|
|
cursor.fg = fg;
|
|
cursor.bg = bg;
|
|
|
|
switch (vc->vc_cursor_type & 0x0f) {
|
|
case CUR_NONE:
|
|
cursor.shape = FB_TILE_CURSOR_NONE;
|
|
break;
|
|
case CUR_UNDERLINE:
|
|
cursor.shape = FB_TILE_CURSOR_UNDERLINE;
|
|
break;
|
|
case CUR_LOWER_THIRD:
|
|
cursor.shape = FB_TILE_CURSOR_LOWER_THIRD;
|
|
break;
|
|
case CUR_LOWER_HALF:
|
|
cursor.shape = FB_TILE_CURSOR_LOWER_HALF;
|
|
break;
|
|
case CUR_TWO_THIRDS:
|
|
cursor.shape = FB_TILE_CURSOR_TWO_THIRDS;
|
|
break;
|
|
case CUR_BLOCK:
|
|
default:
|
|
cursor.shape = FB_TILE_CURSOR_BLOCK;
|
|
break;
|
|
}
|
|
|
|
info->tileops->fb_tilecursor(info, &cursor);
|
|
}
|
|
|
|
static int tile_update_start(struct fb_info *info)
|
|
{
|
|
struct fbcon_ops *ops = info->fbcon_par;
|
|
int err;
|
|
|
|
err = fb_pan_display(info, &ops->var);
|
|
ops->var.xoffset = info->var.xoffset;
|
|
ops->var.yoffset = info->var.yoffset;
|
|
ops->var.vmode = info->var.vmode;
|
|
return err;
|
|
}
|
|
|
|
void fbcon_set_tileops(struct vc_data *vc, struct fb_info *info)
|
|
{
|
|
struct fb_tilemap map;
|
|
struct fbcon_ops *ops = info->fbcon_par;
|
|
|
|
ops->bmove = tile_bmove;
|
|
ops->clear = tile_clear;
|
|
ops->putcs = tile_putcs;
|
|
ops->clear_margins = tile_clear_margins;
|
|
ops->cursor = tile_cursor;
|
|
ops->update_start = tile_update_start;
|
|
|
|
if (ops->p) {
|
|
map.width = vc->vc_font.width;
|
|
map.height = vc->vc_font.height;
|
|
map.depth = 1;
|
|
map.length = vc->vc_font.charcount;
|
|
map.data = ops->p->fontdata;
|
|
info->tileops->fb_settile(info, &map);
|
|
}
|
|
}
|
|
|
|
EXPORT_SYMBOL(fbcon_set_tileops);
|