2005-11-09 13:39:13 +08:00
|
|
|
/*
|
|
|
|
* linux/drivers/video/console/fbcon_ud.c -- Software Rotation - 180 degrees
|
|
|
|
*
|
|
|
|
* 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 cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 16:04:11 +08:00
|
|
|
#include <linux/slab.h>
|
2005-11-09 13:39:13 +08:00
|
|
|
#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"
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Rotation 180 degrees
|
|
|
|
*/
|
|
|
|
|
2010-08-11 09:02:29 +08:00
|
|
|
static void ud_update_attr(u8 *dst, u8 *src, int attribute,
|
2005-11-09 13:39:13 +08:00
|
|
|
struct vc_data *vc)
|
|
|
|
{
|
|
|
|
int i, offset = (vc->vc_font.height < 10) ? 1 : 2;
|
|
|
|
int width = (vc->vc_font.width + 7) >> 3;
|
|
|
|
unsigned int cellsize = vc->vc_font.height * width;
|
|
|
|
u8 c;
|
|
|
|
|
|
|
|
offset = offset * width;
|
|
|
|
|
|
|
|
for (i = 0; i < cellsize; i++) {
|
|
|
|
c = src[i];
|
|
|
|
if (attribute & FBCON_ATTRIBUTE_UNDERLINE && i < offset)
|
|
|
|
c = 0xff;
|
|
|
|
if (attribute & FBCON_ATTRIBUTE_BOLD)
|
|
|
|
c |= c << 1;
|
|
|
|
if (attribute & FBCON_ATTRIBUTE_REVERSE)
|
|
|
|
c = ~c;
|
|
|
|
dst[i] = c;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void ud_bmove(struct vc_data *vc, struct fb_info *info, int sy,
|
|
|
|
int sx, int dy, int dx, int height, int width)
|
|
|
|
{
|
2005-11-14 08:06:32 +08:00
|
|
|
struct fbcon_ops *ops = info->fbcon_par;
|
2005-11-09 13:39:13 +08:00
|
|
|
struct fb_copyarea area;
|
2005-11-14 08:06:32 +08:00
|
|
|
u32 vyres = GETVYRES(ops->p->scrollmode, info);
|
|
|
|
u32 vxres = GETVXRES(ops->p->scrollmode, info);
|
2005-11-09 13:39:13 +08:00
|
|
|
|
|
|
|
area.sy = vyres - ((sy + height) * vc->vc_font.height);
|
|
|
|
area.sx = vxres - ((sx + width) * vc->vc_font.width);
|
|
|
|
area.dy = vyres - ((dy + height) * vc->vc_font.height);
|
|
|
|
area.dx = vxres - ((dx + width) * vc->vc_font.width);
|
|
|
|
area.height = height * vc->vc_font.height;
|
|
|
|
area.width = width * vc->vc_font.width;
|
|
|
|
|
|
|
|
info->fbops->fb_copyarea(info, &area);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void ud_clear(struct vc_data *vc, struct fb_info *info, int sy,
|
|
|
|
int sx, int height, int width)
|
|
|
|
{
|
2005-11-14 08:06:32 +08:00
|
|
|
struct fbcon_ops *ops = info->fbcon_par;
|
2005-11-09 13:39:13 +08:00
|
|
|
struct fb_fillrect region;
|
|
|
|
int bgshift = (vc->vc_hi_font_mask) ? 13 : 12;
|
2005-11-14 08:06:32 +08:00
|
|
|
u32 vyres = GETVYRES(ops->p->scrollmode, info);
|
|
|
|
u32 vxres = GETVXRES(ops->p->scrollmode, info);
|
2005-11-09 13:39:13 +08:00
|
|
|
|
2008-02-06 17:39:45 +08:00
|
|
|
region.color = attr_bgcol_ec(bgshift,vc,info);
|
2005-11-09 13:39:13 +08:00
|
|
|
region.dy = vyres - ((sy + height) * vc->vc_font.height);
|
|
|
|
region.dx = vxres - ((sx + width) * vc->vc_font.width);
|
|
|
|
region.width = width * vc->vc_font.width;
|
|
|
|
region.height = height * vc->vc_font.height;
|
|
|
|
region.rop = ROP_COPY;
|
|
|
|
|
|
|
|
info->fbops->fb_fillrect(info, ®ion);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void ud_putcs_aligned(struct vc_data *vc, struct fb_info *info,
|
|
|
|
const u16 *s, u32 attr, u32 cnt,
|
|
|
|
u32 d_pitch, u32 s_pitch, u32 cellsize,
|
|
|
|
struct fb_image *image, u8 *buf, u8 *dst)
|
|
|
|
{
|
|
|
|
struct fbcon_ops *ops = info->fbcon_par;
|
|
|
|
u16 charmask = vc->vc_hi_font_mask ? 0x1ff : 0xff;
|
|
|
|
u32 idx = vc->vc_font.width >> 3;
|
|
|
|
u8 *src;
|
|
|
|
|
|
|
|
while (cnt--) {
|
|
|
|
src = ops->fontbuffer + (scr_readw(s--) & charmask)*cellsize;
|
|
|
|
|
|
|
|
if (attr) {
|
|
|
|
ud_update_attr(buf, src, attr, vc);
|
|
|
|
src = buf;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (likely(idx == 1))
|
|
|
|
__fb_pad_aligned_buffer(dst, d_pitch, src, idx,
|
|
|
|
image->height);
|
|
|
|
else
|
|
|
|
fb_pad_aligned_buffer(dst, d_pitch, src, idx,
|
|
|
|
image->height);
|
|
|
|
|
|
|
|
dst += s_pitch;
|
|
|
|
}
|
|
|
|
|
|
|
|
info->fbops->fb_imageblit(info, image);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void ud_putcs_unaligned(struct vc_data *vc,
|
|
|
|
struct fb_info *info, const u16 *s,
|
|
|
|
u32 attr, u32 cnt, u32 d_pitch,
|
|
|
|
u32 s_pitch, u32 cellsize,
|
|
|
|
struct fb_image *image, u8 *buf,
|
|
|
|
u8 *dst)
|
|
|
|
{
|
|
|
|
struct fbcon_ops *ops = info->fbcon_par;
|
|
|
|
u16 charmask = vc->vc_hi_font_mask ? 0x1ff : 0xff;
|
|
|
|
u32 shift_low = 0, mod = vc->vc_font.width % 8;
|
|
|
|
u32 shift_high = 8;
|
|
|
|
u32 idx = vc->vc_font.width >> 3;
|
|
|
|
u8 *src;
|
|
|
|
|
|
|
|
while (cnt--) {
|
|
|
|
src = ops->fontbuffer + (scr_readw(s--) & charmask)*cellsize;
|
|
|
|
|
|
|
|
if (attr) {
|
|
|
|
ud_update_attr(buf, src, attr, vc);
|
|
|
|
src = buf;
|
|
|
|
}
|
|
|
|
|
|
|
|
fb_pad_unaligned_buffer(dst, d_pitch, src, idx,
|
|
|
|
image->height, shift_high,
|
|
|
|
shift_low, mod);
|
|
|
|
shift_low += mod;
|
|
|
|
dst += (shift_low >= 8) ? s_pitch : s_pitch - 1;
|
|
|
|
shift_low &= 7;
|
|
|
|
shift_high = 8 - shift_low;
|
|
|
|
}
|
|
|
|
|
|
|
|
info->fbops->fb_imageblit(info, image);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
static void ud_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_image image;
|
|
|
|
struct fbcon_ops *ops = info->fbcon_par;
|
|
|
|
u32 width = (vc->vc_font.width + 7)/8;
|
|
|
|
u32 cellsize = width * vc->vc_font.height;
|
|
|
|
u32 maxcnt = info->pixmap.size/cellsize;
|
|
|
|
u32 scan_align = info->pixmap.scan_align - 1;
|
|
|
|
u32 buf_align = info->pixmap.buf_align - 1;
|
|
|
|
u32 mod = vc->vc_font.width % 8, cnt, pitch, size;
|
|
|
|
u32 attribute = get_attribute(info, scr_readw(s));
|
|
|
|
u8 *dst, *buf = NULL;
|
2005-11-14 08:06:32 +08:00
|
|
|
u32 vyres = GETVYRES(ops->p->scrollmode, info);
|
|
|
|
u32 vxres = GETVXRES(ops->p->scrollmode, info);
|
2005-11-09 13:39:13 +08:00
|
|
|
|
|
|
|
if (!ops->fontbuffer)
|
|
|
|
return;
|
|
|
|
|
|
|
|
image.fg_color = fg;
|
|
|
|
image.bg_color = bg;
|
|
|
|
image.dy = vyres - ((yy * vc->vc_font.height) + vc->vc_font.height);
|
|
|
|
image.dx = vxres - ((xx + count) * vc->vc_font.width);
|
|
|
|
image.height = vc->vc_font.height;
|
|
|
|
image.depth = 1;
|
|
|
|
|
|
|
|
if (attribute) {
|
|
|
|
buf = kmalloc(cellsize, GFP_KERNEL);
|
|
|
|
if (!buf)
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
s += count - 1;
|
|
|
|
|
|
|
|
while (count) {
|
|
|
|
if (count > maxcnt)
|
|
|
|
cnt = maxcnt;
|
|
|
|
else
|
|
|
|
cnt = count;
|
|
|
|
|
|
|
|
image.width = vc->vc_font.width * cnt;
|
|
|
|
pitch = ((image.width + 7) >> 3) + scan_align;
|
|
|
|
pitch &= ~scan_align;
|
|
|
|
size = pitch * image.height + buf_align;
|
|
|
|
size &= ~buf_align;
|
|
|
|
dst = fb_get_buffer_offset(info, &info->pixmap, size);
|
|
|
|
image.data = dst;
|
|
|
|
|
|
|
|
if (!mod)
|
|
|
|
ud_putcs_aligned(vc, info, s, attribute, cnt, pitch,
|
|
|
|
width, cellsize, &image, buf, dst);
|
|
|
|
else
|
|
|
|
ud_putcs_unaligned(vc, info, s, attribute, cnt, pitch,
|
|
|
|
width, cellsize, &image,
|
|
|
|
buf, dst);
|
|
|
|
|
|
|
|
image.dx += image.width;
|
|
|
|
count -= cnt;
|
|
|
|
s -= cnt;
|
|
|
|
xx += cnt;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* buf is always NULL except when in monochrome mode, so in this case
|
|
|
|
it's a gain to check buf against NULL even though kfree() handles
|
|
|
|
NULL pointers just fine */
|
|
|
|
if (unlikely(buf))
|
|
|
|
kfree(buf);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
static void ud_clear_margins(struct vc_data *vc, struct fb_info *info,
|
2017-08-19 01:56:40 +08:00
|
|
|
int color, int bottom_only)
|
2005-11-09 13:39:13 +08:00
|
|
|
{
|
|
|
|
unsigned int cw = vc->vc_font.width;
|
|
|
|
unsigned int ch = vc->vc_font.height;
|
|
|
|
unsigned int rw = info->var.xres - (vc->vc_cols*cw);
|
|
|
|
unsigned int bh = info->var.yres - (vc->vc_rows*ch);
|
|
|
|
struct fb_fillrect region;
|
|
|
|
|
2017-08-19 01:56:40 +08:00
|
|
|
region.color = color;
|
2005-11-09 13:39:13 +08:00
|
|
|
region.rop = ROP_COPY;
|
|
|
|
|
|
|
|
if (rw && !bottom_only) {
|
|
|
|
region.dy = 0;
|
|
|
|
region.dx = info->var.xoffset;
|
|
|
|
region.width = rw;
|
|
|
|
region.height = info->var.yres_virtual;
|
|
|
|
info->fbops->fb_fillrect(info, ®ion);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (bh) {
|
|
|
|
region.dy = info->var.yoffset;
|
|
|
|
region.dx = info->var.xoffset;
|
|
|
|
region.height = bh;
|
|
|
|
region.width = info->var.xres;
|
|
|
|
info->fbops->fb_fillrect(info, ®ion);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-01-10 12:52:56 +08:00
|
|
|
static void ud_cursor(struct vc_data *vc, struct fb_info *info, int mode,
|
|
|
|
int softback_lines, int fg, int bg)
|
2005-11-09 13:39:13 +08:00
|
|
|
{
|
|
|
|
struct fb_cursor cursor;
|
2006-01-10 12:52:56 +08:00
|
|
|
struct fbcon_ops *ops = info->fbcon_par;
|
2005-11-09 13:39:13 +08:00
|
|
|
unsigned short charmask = vc->vc_hi_font_mask ? 0x1ff : 0xff;
|
|
|
|
int w = (vc->vc_font.width + 7) >> 3, c;
|
2006-01-10 12:52:56 +08:00
|
|
|
int y = real_y(ops->p, vc->vc_y);
|
2005-11-09 13:39:13 +08:00
|
|
|
int attribute, use_sw = (vc->vc_cursor_type & 0x10);
|
|
|
|
int err = 1, dx, dy;
|
|
|
|
char *src;
|
2006-01-10 12:52:56 +08:00
|
|
|
u32 vyres = GETVYRES(ops->p->scrollmode, info);
|
|
|
|
u32 vxres = GETVXRES(ops->p->scrollmode, info);
|
2005-11-09 13:39:13 +08:00
|
|
|
|
|
|
|
if (!ops->fontbuffer)
|
|
|
|
return;
|
|
|
|
|
|
|
|
cursor.set = 0;
|
|
|
|
|
|
|
|
if (softback_lines) {
|
|
|
|
if (y + softback_lines >= vc->vc_rows) {
|
|
|
|
mode = CM_ERASE;
|
|
|
|
ops->cursor_flash = 0;
|
|
|
|
return;
|
|
|
|
} else
|
|
|
|
y += softback_lines;
|
|
|
|
}
|
|
|
|
|
|
|
|
c = scr_readw((u16 *) vc->vc_pos);
|
|
|
|
attribute = get_attribute(info, c);
|
|
|
|
src = ops->fontbuffer + ((c & charmask) * (w * vc->vc_font.height));
|
|
|
|
|
|
|
|
if (ops->cursor_state.image.data != src ||
|
|
|
|
ops->cursor_reset) {
|
|
|
|
ops->cursor_state.image.data = src;
|
|
|
|
cursor.set |= FB_CUR_SETIMAGE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (attribute) {
|
|
|
|
u8 *dst;
|
|
|
|
|
treewide: kmalloc() -> kmalloc_array()
The kmalloc() function has a 2-factor argument form, kmalloc_array(). This
patch replaces cases of:
kmalloc(a * b, gfp)
with:
kmalloc_array(a * b, gfp)
as well as handling cases of:
kmalloc(a * b * c, gfp)
with:
kmalloc(array3_size(a, b, c), gfp)
as it's slightly less ugly than:
kmalloc_array(array_size(a, b), c, gfp)
This does, however, attempt to ignore constant size factors like:
kmalloc(4 * 1024, gfp)
though any constants defined via macros get caught up in the conversion.
Any factors with a sizeof() of "unsigned char", "char", and "u8" were
dropped, since they're redundant.
The tools/ directory was manually excluded, since it has its own
implementation of kmalloc().
The Coccinelle script used for this was:
// Fix redundant parens around sizeof().
@@
type TYPE;
expression THING, E;
@@
(
kmalloc(
- (sizeof(TYPE)) * E
+ sizeof(TYPE) * E
, ...)
|
kmalloc(
- (sizeof(THING)) * E
+ sizeof(THING) * E
, ...)
)
// Drop single-byte sizes and redundant parens.
@@
expression COUNT;
typedef u8;
typedef __u8;
@@
(
kmalloc(
- sizeof(u8) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(__u8) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(char) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(unsigned char) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(u8) * COUNT
+ COUNT
, ...)
|
kmalloc(
- sizeof(__u8) * COUNT
+ COUNT
, ...)
|
kmalloc(
- sizeof(char) * COUNT
+ COUNT
, ...)
|
kmalloc(
- sizeof(unsigned char) * COUNT
+ COUNT
, ...)
)
// 2-factor product with sizeof(type/expression) and identifier or constant.
@@
type TYPE;
expression THING;
identifier COUNT_ID;
constant COUNT_CONST;
@@
(
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * (COUNT_ID)
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * COUNT_ID
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * (COUNT_CONST)
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * COUNT_CONST
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * (COUNT_ID)
+ COUNT_ID, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * COUNT_ID
+ COUNT_ID, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * (COUNT_CONST)
+ COUNT_CONST, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * COUNT_CONST
+ COUNT_CONST, sizeof(THING)
, ...)
)
// 2-factor product, only identifiers.
@@
identifier SIZE, COUNT;
@@
- kmalloc
+ kmalloc_array
(
- SIZE * COUNT
+ COUNT, SIZE
, ...)
// 3-factor product with 1 sizeof(type) or sizeof(expression), with
// redundant parens removed.
@@
expression THING;
identifier STRIDE, COUNT;
type TYPE;
@@
(
kmalloc(
- sizeof(TYPE) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(TYPE) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(TYPE) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(TYPE) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(THING) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kmalloc(
- sizeof(THING) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kmalloc(
- sizeof(THING) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kmalloc(
- sizeof(THING) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
)
// 3-factor product with 2 sizeof(variable), with redundant parens removed.
@@
expression THING1, THING2;
identifier COUNT;
type TYPE1, TYPE2;
@@
(
kmalloc(
- sizeof(TYPE1) * sizeof(TYPE2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
kmalloc(
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
kmalloc(
- sizeof(THING1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
kmalloc(
- sizeof(THING1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
kmalloc(
- sizeof(TYPE1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
|
kmalloc(
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
)
// 3-factor product, only identifiers, with redundant parens removed.
@@
identifier STRIDE, SIZE, COUNT;
@@
(
kmalloc(
- (COUNT) * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- (COUNT) * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- (COUNT) * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- (COUNT) * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
)
// Any remaining multi-factor products, first at least 3-factor products,
// when they're not all constants...
@@
expression E1, E2, E3;
constant C1, C2, C3;
@@
(
kmalloc(C1 * C2 * C3, ...)
|
kmalloc(
- (E1) * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
|
kmalloc(
- (E1) * (E2) * E3
+ array3_size(E1, E2, E3)
, ...)
|
kmalloc(
- (E1) * (E2) * (E3)
+ array3_size(E1, E2, E3)
, ...)
|
kmalloc(
- E1 * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
)
// And then all remaining 2 factors products when they're not all constants,
// keeping sizeof() as the second factor argument.
@@
expression THING, E1, E2;
type TYPE;
constant C1, C2, C3;
@@
(
kmalloc(sizeof(THING) * C2, ...)
|
kmalloc(sizeof(TYPE) * C2, ...)
|
kmalloc(C1 * C2 * C3, ...)
|
kmalloc(C1 * C2, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * (E2)
+ E2, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * E2
+ E2, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * (E2)
+ E2, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * E2
+ E2, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- (E1) * E2
+ E1, E2
, ...)
|
- kmalloc
+ kmalloc_array
(
- (E1) * (E2)
+ E1, E2
, ...)
|
- kmalloc
+ kmalloc_array
(
- E1 * E2
+ E1, E2
, ...)
)
Signed-off-by: Kees Cook <keescook@chromium.org>
2018-06-13 04:55:00 +08:00
|
|
|
dst = kmalloc_array(w, vc->vc_font.height, GFP_ATOMIC);
|
2005-11-09 13:39:13 +08:00
|
|
|
if (!dst)
|
|
|
|
return;
|
|
|
|
kfree(ops->cursor_data);
|
|
|
|
ops->cursor_data = dst;
|
|
|
|
ud_update_attr(dst, src, attribute, vc);
|
|
|
|
src = dst;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ops->cursor_state.image.fg_color != fg ||
|
|
|
|
ops->cursor_state.image.bg_color != bg ||
|
|
|
|
ops->cursor_reset) {
|
|
|
|
ops->cursor_state.image.fg_color = fg;
|
|
|
|
ops->cursor_state.image.bg_color = bg;
|
|
|
|
cursor.set |= FB_CUR_SETCMAP;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ops->cursor_state.image.height != vc->vc_font.height ||
|
|
|
|
ops->cursor_state.image.width != vc->vc_font.width ||
|
|
|
|
ops->cursor_reset) {
|
|
|
|
ops->cursor_state.image.height = vc->vc_font.height;
|
|
|
|
ops->cursor_state.image.width = vc->vc_font.width;
|
|
|
|
cursor.set |= FB_CUR_SETSIZE;
|
|
|
|
}
|
|
|
|
|
|
|
|
dy = vyres - ((y * vc->vc_font.height) + vc->vc_font.height);
|
|
|
|
dx = vxres - ((vc->vc_x * vc->vc_font.width) + vc->vc_font.width);
|
|
|
|
|
|
|
|
if (ops->cursor_state.image.dx != dx ||
|
|
|
|
ops->cursor_state.image.dy != dy ||
|
|
|
|
ops->cursor_reset) {
|
|
|
|
ops->cursor_state.image.dx = dx;
|
|
|
|
ops->cursor_state.image.dy = dy;
|
|
|
|
cursor.set |= FB_CUR_SETPOS;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ops->cursor_state.hot.x || ops->cursor_state.hot.y ||
|
|
|
|
ops->cursor_reset) {
|
|
|
|
ops->cursor_state.hot.x = cursor.hot.y = 0;
|
|
|
|
cursor.set |= FB_CUR_SETHOT;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (cursor.set & FB_CUR_SETSIZE ||
|
2006-01-10 12:52:56 +08:00
|
|
|
vc->vc_cursor_type != ops->p->cursor_shape ||
|
2005-11-09 13:39:13 +08:00
|
|
|
ops->cursor_state.mask == NULL ||
|
|
|
|
ops->cursor_reset) {
|
treewide: kmalloc() -> kmalloc_array()
The kmalloc() function has a 2-factor argument form, kmalloc_array(). This
patch replaces cases of:
kmalloc(a * b, gfp)
with:
kmalloc_array(a * b, gfp)
as well as handling cases of:
kmalloc(a * b * c, gfp)
with:
kmalloc(array3_size(a, b, c), gfp)
as it's slightly less ugly than:
kmalloc_array(array_size(a, b), c, gfp)
This does, however, attempt to ignore constant size factors like:
kmalloc(4 * 1024, gfp)
though any constants defined via macros get caught up in the conversion.
Any factors with a sizeof() of "unsigned char", "char", and "u8" were
dropped, since they're redundant.
The tools/ directory was manually excluded, since it has its own
implementation of kmalloc().
The Coccinelle script used for this was:
// Fix redundant parens around sizeof().
@@
type TYPE;
expression THING, E;
@@
(
kmalloc(
- (sizeof(TYPE)) * E
+ sizeof(TYPE) * E
, ...)
|
kmalloc(
- (sizeof(THING)) * E
+ sizeof(THING) * E
, ...)
)
// Drop single-byte sizes and redundant parens.
@@
expression COUNT;
typedef u8;
typedef __u8;
@@
(
kmalloc(
- sizeof(u8) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(__u8) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(char) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(unsigned char) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(u8) * COUNT
+ COUNT
, ...)
|
kmalloc(
- sizeof(__u8) * COUNT
+ COUNT
, ...)
|
kmalloc(
- sizeof(char) * COUNT
+ COUNT
, ...)
|
kmalloc(
- sizeof(unsigned char) * COUNT
+ COUNT
, ...)
)
// 2-factor product with sizeof(type/expression) and identifier or constant.
@@
type TYPE;
expression THING;
identifier COUNT_ID;
constant COUNT_CONST;
@@
(
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * (COUNT_ID)
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * COUNT_ID
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * (COUNT_CONST)
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * COUNT_CONST
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * (COUNT_ID)
+ COUNT_ID, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * COUNT_ID
+ COUNT_ID, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * (COUNT_CONST)
+ COUNT_CONST, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * COUNT_CONST
+ COUNT_CONST, sizeof(THING)
, ...)
)
// 2-factor product, only identifiers.
@@
identifier SIZE, COUNT;
@@
- kmalloc
+ kmalloc_array
(
- SIZE * COUNT
+ COUNT, SIZE
, ...)
// 3-factor product with 1 sizeof(type) or sizeof(expression), with
// redundant parens removed.
@@
expression THING;
identifier STRIDE, COUNT;
type TYPE;
@@
(
kmalloc(
- sizeof(TYPE) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(TYPE) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(TYPE) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(TYPE) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(THING) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kmalloc(
- sizeof(THING) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kmalloc(
- sizeof(THING) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kmalloc(
- sizeof(THING) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
)
// 3-factor product with 2 sizeof(variable), with redundant parens removed.
@@
expression THING1, THING2;
identifier COUNT;
type TYPE1, TYPE2;
@@
(
kmalloc(
- sizeof(TYPE1) * sizeof(TYPE2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
kmalloc(
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
kmalloc(
- sizeof(THING1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
kmalloc(
- sizeof(THING1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
kmalloc(
- sizeof(TYPE1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
|
kmalloc(
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
)
// 3-factor product, only identifiers, with redundant parens removed.
@@
identifier STRIDE, SIZE, COUNT;
@@
(
kmalloc(
- (COUNT) * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- (COUNT) * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- (COUNT) * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- (COUNT) * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
)
// Any remaining multi-factor products, first at least 3-factor products,
// when they're not all constants...
@@
expression E1, E2, E3;
constant C1, C2, C3;
@@
(
kmalloc(C1 * C2 * C3, ...)
|
kmalloc(
- (E1) * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
|
kmalloc(
- (E1) * (E2) * E3
+ array3_size(E1, E2, E3)
, ...)
|
kmalloc(
- (E1) * (E2) * (E3)
+ array3_size(E1, E2, E3)
, ...)
|
kmalloc(
- E1 * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
)
// And then all remaining 2 factors products when they're not all constants,
// keeping sizeof() as the second factor argument.
@@
expression THING, E1, E2;
type TYPE;
constant C1, C2, C3;
@@
(
kmalloc(sizeof(THING) * C2, ...)
|
kmalloc(sizeof(TYPE) * C2, ...)
|
kmalloc(C1 * C2 * C3, ...)
|
kmalloc(C1 * C2, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * (E2)
+ E2, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * E2
+ E2, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * (E2)
+ E2, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * E2
+ E2, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- (E1) * E2
+ E1, E2
, ...)
|
- kmalloc
+ kmalloc_array
(
- (E1) * (E2)
+ E1, E2
, ...)
|
- kmalloc
+ kmalloc_array
(
- E1 * E2
+ E1, E2
, ...)
)
Signed-off-by: Kees Cook <keescook@chromium.org>
2018-06-13 04:55:00 +08:00
|
|
|
char *mask = kmalloc_array(w, vc->vc_font.height, GFP_ATOMIC);
|
2005-11-09 13:39:13 +08:00
|
|
|
int cur_height, size, i = 0;
|
|
|
|
u8 msk = 0xff;
|
|
|
|
|
|
|
|
if (!mask)
|
|
|
|
return;
|
|
|
|
|
|
|
|
kfree(ops->cursor_state.mask);
|
|
|
|
ops->cursor_state.mask = mask;
|
|
|
|
|
2006-01-10 12:52:56 +08:00
|
|
|
ops->p->cursor_shape = vc->vc_cursor_type;
|
2005-11-09 13:39:13 +08:00
|
|
|
cursor.set |= FB_CUR_SETSHAPE;
|
|
|
|
|
2006-01-10 12:52:56 +08:00
|
|
|
switch (ops->p->cursor_shape & CUR_HWMASK) {
|
2005-11-09 13:39:13 +08:00
|
|
|
case CUR_NONE:
|
|
|
|
cur_height = 0;
|
|
|
|
break;
|
|
|
|
case CUR_UNDERLINE:
|
|
|
|
cur_height = (vc->vc_font.height < 10) ? 1 : 2;
|
|
|
|
break;
|
|
|
|
case CUR_LOWER_THIRD:
|
|
|
|
cur_height = vc->vc_font.height/3;
|
|
|
|
break;
|
|
|
|
case CUR_LOWER_HALF:
|
|
|
|
cur_height = vc->vc_font.height >> 1;
|
|
|
|
break;
|
|
|
|
case CUR_TWO_THIRDS:
|
|
|
|
cur_height = (vc->vc_font.height << 1)/3;
|
|
|
|
break;
|
|
|
|
case CUR_BLOCK:
|
|
|
|
default:
|
|
|
|
cur_height = vc->vc_font.height;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
size = cur_height * w;
|
|
|
|
|
|
|
|
while (size--)
|
|
|
|
mask[i++] = msk;
|
|
|
|
|
|
|
|
size = (vc->vc_font.height - cur_height) * w;
|
|
|
|
|
|
|
|
while (size--)
|
|
|
|
mask[i++] = ~msk;
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (mode) {
|
|
|
|
case CM_ERASE:
|
|
|
|
ops->cursor_state.enable = 0;
|
|
|
|
break;
|
|
|
|
case CM_DRAW:
|
|
|
|
case CM_MOVE:
|
|
|
|
default:
|
|
|
|
ops->cursor_state.enable = (use_sw) ? 0 : 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
cursor.image.data = src;
|
|
|
|
cursor.image.fg_color = ops->cursor_state.image.fg_color;
|
|
|
|
cursor.image.bg_color = ops->cursor_state.image.bg_color;
|
|
|
|
cursor.image.dx = ops->cursor_state.image.dx;
|
|
|
|
cursor.image.dy = ops->cursor_state.image.dy;
|
|
|
|
cursor.image.height = ops->cursor_state.image.height;
|
|
|
|
cursor.image.width = ops->cursor_state.image.width;
|
|
|
|
cursor.hot.x = ops->cursor_state.hot.x;
|
|
|
|
cursor.hot.y = ops->cursor_state.hot.y;
|
|
|
|
cursor.mask = ops->cursor_state.mask;
|
|
|
|
cursor.enable = ops->cursor_state.enable;
|
|
|
|
cursor.image.depth = 1;
|
|
|
|
cursor.rop = ROP_XOR;
|
|
|
|
|
|
|
|
if (info->fbops->fb_cursor)
|
|
|
|
err = info->fbops->fb_cursor(info, &cursor);
|
|
|
|
|
|
|
|
if (err)
|
|
|
|
soft_cursor(info, &cursor);
|
|
|
|
|
|
|
|
ops->cursor_reset = 0;
|
|
|
|
}
|
|
|
|
|
2006-10-03 16:15:05 +08:00
|
|
|
static int ud_update_start(struct fb_info *info)
|
2005-11-09 13:39:13 +08:00
|
|
|
{
|
|
|
|
struct fbcon_ops *ops = info->fbcon_par;
|
2005-12-20 15:18:09 +08:00
|
|
|
int xoffset, yoffset;
|
2005-11-14 08:06:32 +08:00
|
|
|
u32 vyres = GETVYRES(ops->p->scrollmode, info);
|
|
|
|
u32 vxres = GETVXRES(ops->p->scrollmode, info);
|
2005-11-09 13:39:13 +08:00
|
|
|
int err;
|
|
|
|
|
2005-12-20 15:18:09 +08:00
|
|
|
xoffset = vxres - info->var.xres - ops->var.xoffset;
|
|
|
|
yoffset = vyres - info->var.yres - ops->var.yoffset;
|
|
|
|
if (yoffset < 0)
|
|
|
|
yoffset += vyres;
|
2005-11-09 13:39:13 +08:00
|
|
|
ops->var.xoffset = xoffset;
|
|
|
|
ops->var.yoffset = yoffset;
|
|
|
|
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_rotate_ud(struct fbcon_ops *ops)
|
|
|
|
{
|
|
|
|
ops->bmove = ud_bmove;
|
|
|
|
ops->clear = ud_clear;
|
|
|
|
ops->putcs = ud_putcs;
|
|
|
|
ops->clear_margins = ud_clear_margins;
|
|
|
|
ops->cursor = ud_cursor;
|
|
|
|
ops->update_start = ud_update_start;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(fbcon_rotate_ud);
|