a1ac250a82
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
113 lines
2.4 KiB
C
113 lines
2.4 KiB
C
/*
|
|
* linux/drivers/video/console/fbcon_rotate.c -- Software Rotation
|
|
*
|
|
* Copyright (C) 2005 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/slab.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"
|
|
#include "fbcon_rotate.h"
|
|
|
|
static int fbcon_rotate_font(struct fb_info *info, struct vc_data *vc)
|
|
{
|
|
struct fbcon_ops *ops = info->fbcon_par;
|
|
int len, err = 0;
|
|
int s_cellsize, d_cellsize, i;
|
|
const u8 *src;
|
|
u8 *dst;
|
|
|
|
if (vc->vc_font.data == ops->fontdata &&
|
|
ops->p->con_rotate == ops->cur_rotate)
|
|
goto finished;
|
|
|
|
src = ops->fontdata = vc->vc_font.data;
|
|
ops->cur_rotate = ops->p->con_rotate;
|
|
len = vc->vc_font.charcount;
|
|
s_cellsize = ((vc->vc_font.width + 7)/8) *
|
|
vc->vc_font.height;
|
|
d_cellsize = s_cellsize;
|
|
|
|
if (ops->rotate == FB_ROTATE_CW ||
|
|
ops->rotate == FB_ROTATE_CCW)
|
|
d_cellsize = ((vc->vc_font.height + 7)/8) *
|
|
vc->vc_font.width;
|
|
|
|
if (info->fbops->fb_sync)
|
|
info->fbops->fb_sync(info);
|
|
|
|
if (ops->fd_size < d_cellsize * len) {
|
|
dst = kmalloc_array(len, d_cellsize, GFP_KERNEL);
|
|
|
|
if (dst == NULL) {
|
|
err = -ENOMEM;
|
|
goto finished;
|
|
}
|
|
|
|
ops->fd_size = d_cellsize * len;
|
|
kfree(ops->fontbuffer);
|
|
ops->fontbuffer = dst;
|
|
}
|
|
|
|
dst = ops->fontbuffer;
|
|
memset(dst, 0, ops->fd_size);
|
|
|
|
switch (ops->rotate) {
|
|
case FB_ROTATE_UD:
|
|
for (i = len; i--; ) {
|
|
rotate_ud(src, dst, vc->vc_font.width,
|
|
vc->vc_font.height);
|
|
|
|
src += s_cellsize;
|
|
dst += d_cellsize;
|
|
}
|
|
break;
|
|
case FB_ROTATE_CW:
|
|
for (i = len; i--; ) {
|
|
rotate_cw(src, dst, vc->vc_font.width,
|
|
vc->vc_font.height);
|
|
src += s_cellsize;
|
|
dst += d_cellsize;
|
|
}
|
|
break;
|
|
case FB_ROTATE_CCW:
|
|
for (i = len; i--; ) {
|
|
rotate_ccw(src, dst, vc->vc_font.width,
|
|
vc->vc_font.height);
|
|
src += s_cellsize;
|
|
dst += d_cellsize;
|
|
}
|
|
break;
|
|
}
|
|
|
|
finished:
|
|
return err;
|
|
}
|
|
|
|
void fbcon_set_rotate(struct fbcon_ops *ops)
|
|
{
|
|
ops->rotate_font = fbcon_rotate_font;
|
|
|
|
switch(ops->rotate) {
|
|
case FB_ROTATE_CW:
|
|
fbcon_rotate_cw(ops);
|
|
break;
|
|
case FB_ROTATE_UD:
|
|
fbcon_rotate_ud(ops);
|
|
break;
|
|
case FB_ROTATE_CCW:
|
|
fbcon_rotate_ccw(ops);
|
|
break;
|
|
}
|
|
}
|
|
EXPORT_SYMBOL(fbcon_set_rotate);
|