mirror of
https://github.com/raspberrypi/linux.git
synced 2026-01-02 07:43:34 +00:00
The erase colour calculation for fbcon clearing should use get_color instead of attr_col_ec, like everything else. The latter is similar but is not correct. For example it's missing the depth dependent remapping and doesn't care about blanking. The problem can be reproduced by setting up the background colour to grey (vt.color=0x70) and having an fbcon console set to 2bpp (4 shades of gray). Now the background attribute should be 1 (dark gray) on the console. If the screen is scrolled when pressing enter in a shell prompt at the bottom line then the new line is cleared using colour 7 instead of 1. That's not something fillrect likes (at 2bbp it expect 0-3) so the result is interesting. This patch switches to get_color with vc_video_erase_char to determine the erase colour from attr_col_ec. That makes the latter function redundant as no other users were left. Use correct erase colour for clearing in fbcon Signed-off-by: Zsolt Kajtar <soci@c64.rulez.org> Signed-off-by: Helge Deller <deller@gmx.de>
429 lines
11 KiB
C
429 lines
11 KiB
C
/*
|
|
* 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 <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"
|
|
|
|
/*
|
|
* Rotation 180 degrees
|
|
*/
|
|
|
|
static void ud_update_attr(u8 *dst, u8 *src, int attribute,
|
|
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)
|
|
{
|
|
struct fbcon_ops *ops = info->fbcon_par;
|
|
struct fb_copyarea area;
|
|
u32 vyres = GETVYRES(ops->p, info);
|
|
u32 vxres = GETVXRES(ops->p, info);
|
|
|
|
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, int fg, int bg)
|
|
{
|
|
struct fbcon_ops *ops = info->fbcon_par;
|
|
struct fb_fillrect region;
|
|
u32 vyres = GETVYRES(ops->p, info);
|
|
u32 vxres = GETVXRES(ops->p, info);
|
|
|
|
region.color = bg;
|
|
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;
|
|
u32 vyres = GETVYRES(ops->p, info);
|
|
u32 vxres = GETVXRES(ops->p, info);
|
|
|
|
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,
|
|
int color, int bottom_only)
|
|
{
|
|
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;
|
|
|
|
region.color = color;
|
|
region.rop = ROP_COPY;
|
|
|
|
if ((int) rw > 0 && !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 ((int) bh > 0) {
|
|
region.dy = info->var.yoffset;
|
|
region.dx = info->var.xoffset;
|
|
region.height = bh;
|
|
region.width = info->var.xres;
|
|
info->fbops->fb_fillrect(info, ®ion);
|
|
}
|
|
}
|
|
|
|
static void ud_cursor(struct vc_data *vc, struct fb_info *info, bool enable,
|
|
int fg, int bg)
|
|
{
|
|
struct fb_cursor cursor;
|
|
struct fbcon_ops *ops = info->fbcon_par;
|
|
unsigned short charmask = vc->vc_hi_font_mask ? 0x1ff : 0xff;
|
|
int w = (vc->vc_font.width + 7) >> 3, c;
|
|
int y = real_y(ops->p, vc->state.y);
|
|
int attribute, use_sw = vc->vc_cursor_type & CUR_SW;
|
|
int err = 1, dx, dy;
|
|
char *src;
|
|
u32 vyres = GETVYRES(ops->p, info);
|
|
u32 vxres = GETVXRES(ops->p, info);
|
|
|
|
if (!ops->fontbuffer)
|
|
return;
|
|
|
|
cursor.set = 0;
|
|
|
|
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;
|
|
|
|
dst = kmalloc_array(w, vc->vc_font.height, GFP_ATOMIC);
|
|
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->state.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 ||
|
|
vc->vc_cursor_type != ops->p->cursor_shape ||
|
|
ops->cursor_state.mask == NULL ||
|
|
ops->cursor_reset) {
|
|
char *mask = kmalloc_array(w, vc->vc_font.height, GFP_ATOMIC);
|
|
int cur_height, size, i = 0;
|
|
u8 msk = 0xff;
|
|
|
|
if (!mask)
|
|
return;
|
|
|
|
kfree(ops->cursor_state.mask);
|
|
ops->cursor_state.mask = mask;
|
|
|
|
ops->p->cursor_shape = vc->vc_cursor_type;
|
|
cursor.set |= FB_CUR_SETSHAPE;
|
|
|
|
switch (CUR_SIZE(ops->p->cursor_shape)) {
|
|
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;
|
|
}
|
|
|
|
ops->cursor_state.enable = enable && !use_sw;
|
|
|
|
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;
|
|
}
|
|
|
|
static int ud_update_start(struct fb_info *info)
|
|
{
|
|
struct fbcon_ops *ops = info->fbcon_par;
|
|
int xoffset, yoffset;
|
|
u32 vyres = GETVYRES(ops->p, info);
|
|
u32 vxres = GETVXRES(ops->p, info);
|
|
int err;
|
|
|
|
xoffset = vxres - info->var.xres - ops->var.xoffset;
|
|
yoffset = vyres - info->var.yres - ops->var.yoffset;
|
|
if (yoffset < 0)
|
|
yoffset += vyres;
|
|
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;
|
|
}
|