1a9c3f78a3
Remove bogus usage of test/set_bit() from fbcon rotation code and just manipulate the bits directly. This fixes an oops on powerpc among others and should be faster. Seems to work fine on the G5 here. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Acked-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
426 lines
11 KiB
C
426 lines
11 KiB
C
/*
|
|
* linux/drivers/video/console/fbcon_ccw.c -- Software Rotation - 270 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/config.h>
|
|
#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"
|
|
#include "fbcon_rotate.h"
|
|
|
|
/*
|
|
* Rotation 270 degrees
|
|
*/
|
|
|
|
static inline void ccw_update_attr(u8 *dst, u8 *src, int attribute,
|
|
struct vc_data *vc)
|
|
{
|
|
int i, j, offset = (vc->vc_font.height < 10) ? 1 : 2;
|
|
int width = (vc->vc_font.height + 7) >> 3;
|
|
int mod = vc->vc_font.height % 8;
|
|
u8 c, msk = ~(0xff << offset), msk1 = 0;
|
|
|
|
if (mod)
|
|
msk <<= (8 - mod);
|
|
|
|
if (offset > mod)
|
|
msk1 |= 0x01;
|
|
|
|
for (i = 0; i < vc->vc_font.width; i++) {
|
|
for (j = 0; j < width; j++) {
|
|
c = *src;
|
|
|
|
if (attribute & FBCON_ATTRIBUTE_UNDERLINE) {
|
|
if (j == width - 1)
|
|
c |= msk;
|
|
|
|
if (msk1 && j == width - 2)
|
|
c |= msk1;
|
|
}
|
|
|
|
if (attribute & FBCON_ATTRIBUTE_BOLD && i)
|
|
*(dst - width) |= c;
|
|
|
|
if (attribute & FBCON_ATTRIBUTE_REVERSE)
|
|
c = ~c;
|
|
src++;
|
|
*dst++ = c;
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
static void ccw_bmove(struct vc_data *vc, struct fb_info *info, int sy,
|
|
int sx, int dy, int dx, int height, int width)
|
|
{
|
|
struct fbcon_ops *ops = info->fbcon_par;
|
|
struct fb_copyarea area;
|
|
u32 vyres = GETVYRES(ops->p->scrollmode, info);
|
|
|
|
area.sx = sy * vc->vc_font.height;
|
|
area.sy = vyres - ((sx + width) * vc->vc_font.width);
|
|
area.dx = dy * vc->vc_font.height;
|
|
area.dy = vyres - ((dx + width) * vc->vc_font.width);
|
|
area.width = height * vc->vc_font.height;
|
|
area.height = width * vc->vc_font.width;
|
|
|
|
info->fbops->fb_copyarea(info, &area);
|
|
}
|
|
|
|
static void ccw_clear(struct vc_data *vc, struct fb_info *info, int sy,
|
|
int sx, int height, int width)
|
|
{
|
|
struct fbcon_ops *ops = info->fbcon_par;
|
|
struct fb_fillrect region;
|
|
int bgshift = (vc->vc_hi_font_mask) ? 13 : 12;
|
|
u32 vyres = GETVYRES(ops->p->scrollmode, info);
|
|
|
|
region.color = attr_bgcol_ec(bgshift,vc);
|
|
region.dx = sy * vc->vc_font.height;
|
|
region.dy = vyres - ((sx + width) * vc->vc_font.width);
|
|
region.height = width * vc->vc_font.width;
|
|
region.width = height * vc->vc_font.height;
|
|
region.rop = ROP_COPY;
|
|
|
|
info->fbops->fb_fillrect(info, ®ion);
|
|
}
|
|
|
|
static inline void ccw_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.height + 7) >> 3;
|
|
u8 *src;
|
|
|
|
while (cnt--) {
|
|
src = ops->fontbuffer + (scr_readw(s--) & charmask)*cellsize;
|
|
|
|
if (attr) {
|
|
ccw_update_attr(buf, src, attr, vc);
|
|
src = buf;
|
|
}
|
|
|
|
if (likely(idx == 1))
|
|
__fb_pad_aligned_buffer(dst, d_pitch, src, idx,
|
|
vc->vc_font.width);
|
|
else
|
|
fb_pad_aligned_buffer(dst, d_pitch, src, idx,
|
|
vc->vc_font.width);
|
|
|
|
dst += d_pitch * vc->vc_font.width;
|
|
}
|
|
|
|
info->fbops->fb_imageblit(info, image);
|
|
}
|
|
|
|
static void ccw_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.height + 7)/8;
|
|
u32 cellsize = width * vc->vc_font.width;
|
|
u32 maxcnt = info->pixmap.size/cellsize;
|
|
u32 scan_align = info->pixmap.scan_align - 1;
|
|
u32 buf_align = info->pixmap.buf_align - 1;
|
|
u32 cnt, pitch, size;
|
|
u32 attribute = get_attribute(info, scr_readw(s));
|
|
u8 *dst, *buf = NULL;
|
|
u32 vyres = GETVYRES(ops->p->scrollmode, info);
|
|
|
|
if (!ops->fontbuffer)
|
|
return;
|
|
|
|
image.fg_color = fg;
|
|
image.bg_color = bg;
|
|
image.dx = yy * vc->vc_font.height;
|
|
image.dy = vyres - ((xx + count) * vc->vc_font.width);
|
|
image.width = 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.height = 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;
|
|
ccw_putcs_aligned(vc, info, s, attribute, cnt, pitch,
|
|
width, cellsize, &image, buf, dst);
|
|
image.dy += image.height;
|
|
count -= cnt;
|
|
s -= 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 ccw_clear_margins(struct vc_data *vc, struct fb_info *info,
|
|
int bottom_only)
|
|
{
|
|
unsigned int cw = vc->vc_font.width;
|
|
unsigned int ch = vc->vc_font.height;
|
|
unsigned int rw = info->var.yres - (vc->vc_cols*cw);
|
|
unsigned int bh = info->var.xres - (vc->vc_rows*ch);
|
|
unsigned int bs = vc->vc_rows*ch;
|
|
struct fb_fillrect region;
|
|
int bgshift = (vc->vc_hi_font_mask) ? 13 : 12;
|
|
|
|
region.color = attr_bgcol_ec(bgshift,vc);
|
|
region.rop = ROP_COPY;
|
|
|
|
if (rw && !bottom_only) {
|
|
region.dx = 0;
|
|
region.dy = info->var.yoffset;
|
|
region.height = rw;
|
|
region.width = info->var.xres_virtual;
|
|
info->fbops->fb_fillrect(info, ®ion);
|
|
}
|
|
|
|
if (bh) {
|
|
region.dx = info->var.xoffset + bs;
|
|
region.dy = 0;
|
|
region.height = info->var.yres_virtual;
|
|
region.width = bh;
|
|
info->fbops->fb_fillrect(info, ®ion);
|
|
}
|
|
}
|
|
|
|
static void ccw_cursor(struct vc_data *vc, struct fb_info *info,
|
|
struct display *p, int mode, int softback_lines,
|
|
int fg, int bg)
|
|
{
|
|
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.height + 7) >> 3, c;
|
|
int y = real_y(p, vc->vc_y);
|
|
int attribute, use_sw = (vc->vc_cursor_type & 0x10);
|
|
int err = 1, dx, dy;
|
|
char *src;
|
|
u32 vyres = GETVYRES(p->scrollmode, info);
|
|
|
|
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.width));
|
|
|
|
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;
|
|
|
|
dst = kmalloc(w * vc->vc_font.width, GFP_ATOMIC);
|
|
if (!dst)
|
|
return;
|
|
kfree(ops->cursor_data);
|
|
ops->cursor_data = dst;
|
|
ccw_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.width ||
|
|
ops->cursor_state.image.width != vc->vc_font.height ||
|
|
ops->cursor_reset) {
|
|
ops->cursor_state.image.height = vc->vc_font.width;
|
|
ops->cursor_state.image.width = vc->vc_font.height;
|
|
cursor.set |= FB_CUR_SETSIZE;
|
|
}
|
|
|
|
dx = y * vc->vc_font.height;
|
|
dy = vyres - ((vc->vc_x + 1) * 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 ||
|
|
vc->vc_cursor_type != p->cursor_shape ||
|
|
ops->cursor_state.mask == NULL ||
|
|
ops->cursor_reset) {
|
|
char *tmp, *mask = kmalloc(w*vc->vc_font.width, GFP_ATOMIC);
|
|
int cur_height, size, i = 0;
|
|
int width = (vc->vc_font.width + 7)/8;
|
|
|
|
if (!mask)
|
|
return;
|
|
|
|
tmp = kmalloc(width * vc->vc_font.height, GFP_ATOMIC);
|
|
|
|
if (!tmp) {
|
|
kfree(mask);
|
|
return;
|
|
}
|
|
|
|
kfree(ops->cursor_state.mask);
|
|
ops->cursor_state.mask = mask;
|
|
|
|
p->cursor_shape = vc->vc_cursor_type;
|
|
cursor.set |= FB_CUR_SETSHAPE;
|
|
|
|
switch (p->cursor_shape & CUR_HWMASK) {
|
|
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 = (vc->vc_font.height - cur_height) * width;
|
|
while (size--)
|
|
tmp[i++] = 0;
|
|
size = cur_height * width;
|
|
while (size--)
|
|
tmp[i++] = 0xff;
|
|
memset(mask, 0, w * vc->vc_font.width);
|
|
rotate_ccw(tmp, mask, vc->vc_font.width, vc->vc_font.height);
|
|
kfree(tmp);
|
|
}
|
|
|
|
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;
|
|
}
|
|
|
|
int ccw_update_start(struct fb_info *info)
|
|
{
|
|
struct fbcon_ops *ops = info->fbcon_par;
|
|
u32 yoffset;
|
|
u32 vyres = GETVYRES(ops->p->scrollmode, info);
|
|
int err;
|
|
|
|
yoffset = (vyres - info->var.yres) - ops->var.xoffset;
|
|
ops->var.xoffset = ops->var.yoffset;
|
|
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_ccw(struct fbcon_ops *ops)
|
|
{
|
|
ops->bmove = ccw_bmove;
|
|
ops->clear = ccw_clear;
|
|
ops->putcs = ccw_putcs;
|
|
ops->clear_margins = ccw_clear_margins;
|
|
ops->cursor = ccw_cursor;
|
|
ops->update_start = ccw_update_start;
|
|
}
|
|
EXPORT_SYMBOL(fbcon_rotate_ccw);
|
|
|
|
MODULE_AUTHOR("Antonino Daplas <adaplas@pol.net>");
|
|
MODULE_DESCRIPTION("Console Rotation (270 degrees) Support");
|
|
MODULE_LICENSE("GPL");
|