Commit 1148836f authored by Helge Deller's avatar Helge Deller Committed by Daniel Vetter

Revert "fbdev: Garbage collect fbdev scrolling acceleration, part 1 (from TODO list)"

This reverts commit b3ec8cdf.

Revert the second (of 2) commits which disabled scrolling acceleration
in fbcon/fbdev.  It introduced a regression for fbdev-supported graphic
cards because of the performance penalty by doing screen scrolling by
software instead of using the existing graphic card 2D hardware
acceleration.

Console scrolling acceleration was disabled by dropping code which
checked at runtime the driver hardware capabilities for the
BINFO_HWACCEL_COPYAREA or FBINFO_HWACCEL_FILLRECT flags and if set, it
enabled scrollmode SCROLL_MOVE which uses hardware acceleration to move
screen contents.  After dropping those checks scrollmode was hard-wired
to SCROLL_REDRAW instead, which forces all graphic cards to redraw every
character at the new screen position when scrolling.

This change effectively disabled all hardware-based scrolling acceleration for
ALL drivers, because now all kind of 2D hardware acceleration (bitblt,
fillrect) in the drivers isn't used any longer.

The original commit message mentions that only 3 DRM drivers (nouveau, omapdrm
and gma500) used hardware acceleration in the past and thus code for checking
and using scrolling acceleration is obsolete.

This statement is NOT TRUE, because beside the DRM drivers there are around 35
other fbdev drivers which depend on fbdev/fbcon and still provide hardware
acceleration for fbdev/fbcon.

The original commit message also states that syzbot found lots of bugs in fbcon
and thus it's "often the solution to just delete code and remove features".
This is true, and the bugs - which actually affected all users of fbcon,
including DRM - were fixed, or code was dropped like e.g. the support for
software scrollback in vgacon (commit 973c096f).

So to further analyze which bugs were found by syzbot, I've looked through all
patches in drivers/video which were tagged with syzbot or syzkaller back to
year 2005. The vast majority fixed the reported issues on a higher level, e.g.
when screen is to be resized, or when font size is to be changed. The few ones
which touched driver code fixed a real driver bug, e.g. by adding a check.

But NONE of those patches touched code of either the SCROLL_MOVE or the
SCROLL_REDRAW case.

That means, there was no real reason why SCROLL_MOVE had to be ripped-out and
just SCROLL_REDRAW had to be used instead. The only reason I can imagine so far
was that SCROLL_MOVE wasn't used by DRM and as such it was assumed that it
could go away. That argument completely missed the fact that SCROLL_MOVE is
still heavily used by fbdev (non-DRM) drivers.

Some people mention that using memcpy() instead of the hardware acceleration is
pretty much the same speed. But that's not true, at least not for older graphic
cards and machines where we see speed decreases by factor 10 and more and thus
this change leads to console responsiveness way worse than before.

That's why the original commit is to be reverted. By reverting we
reintroduce hardware-based scrolling acceleration and fix the
performance regression for fbdev drivers.

There isn't any impact on DRM when reverting those patches.
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Acked-by: default avatarSven Schnelle <svens@stackframe.org>
Cc: stable@vger.kernel.org # v5.16+
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20220202135531.92183-2-deller@gmx.de
parent 92c4cfae
...@@ -303,19 +303,16 @@ Level: Advanced ...@@ -303,19 +303,16 @@ Level: Advanced
Garbage collect fbdev scrolling acceleration Garbage collect fbdev scrolling acceleration
-------------------------------------------- --------------------------------------------
Scroll acceleration has been disabled in fbcon. Now it works as the old Scroll acceleration is disabled in fbcon by hard-wiring p->scrollmode =
SCROLL_REDRAW mode. A ton of code was removed in fbcon.c and the hook bmove was SCROLL_REDRAW. There's a ton of code this will allow us to remove:
removed from fbcon_ops.
Remaining tasks:
- a bunch of the hooks in fbcon_ops could be removed or simplified by calling - lots of code in fbcon.c
- a bunch of the hooks in fbcon_ops, maybe the remaining hooks could be called
directly instead of the function table (with a switch on p->rotate) directly instead of the function table (with a switch on p->rotate)
- fb_copyarea is unused after this, and can be deleted from all drivers - fb_copyarea is unused after this, and can be deleted from all drivers
- after that, fb_copyarea can be deleted from fb_ops in include/linux/fb.h as
well as cfb_copyarea
Note that not all acceleration code can be deleted, since clearing and cursor Note that not all acceleration code can be deleted, since clearing and cursor
support is still accelerated, which might be good candidates for further support is still accelerated, which might be good candidates for further
deletion projects. deletion projects.
......
...@@ -43,6 +43,21 @@ static void update_attr(u8 *dst, u8 *src, int attribute, ...@@ -43,6 +43,21 @@ static void update_attr(u8 *dst, u8 *src, int attribute,
} }
} }
static void bit_bmove(struct vc_data *vc, struct fb_info *info, int sy,
int sx, int dy, int dx, int height, int width)
{
struct fb_copyarea area;
area.sx = sx * vc->vc_font.width;
area.sy = sy * vc->vc_font.height;
area.dx = dx * vc->vc_font.width;
area.dy = dy * vc->vc_font.height;
area.height = height * vc->vc_font.height;
area.width = width * vc->vc_font.width;
info->fbops->fb_copyarea(info, &area);
}
static void bit_clear(struct vc_data *vc, struct fb_info *info, int sy, static void bit_clear(struct vc_data *vc, struct fb_info *info, int sy,
int sx, int height, int width) int sx, int height, int width)
{ {
...@@ -378,6 +393,7 @@ static int bit_update_start(struct fb_info *info) ...@@ -378,6 +393,7 @@ static int bit_update_start(struct fb_info *info)
void fbcon_set_bitops(struct fbcon_ops *ops) void fbcon_set_bitops(struct fbcon_ops *ops)
{ {
ops->bmove = bit_bmove;
ops->clear = bit_clear; ops->clear = bit_clear;
ops->putcs = bit_putcs; ops->putcs = bit_putcs;
ops->clear_margins = bit_clear_margins; ops->clear_margins = bit_clear_margins;
......
This diff is collapsed.
...@@ -29,6 +29,7 @@ struct fbcon_display { ...@@ -29,6 +29,7 @@ struct fbcon_display {
/* Filled in by the low-level console driver */ /* Filled in by the low-level console driver */
const u_char *fontdata; const u_char *fontdata;
int userfont; /* != 0 if fontdata kmalloc()ed */ int userfont; /* != 0 if fontdata kmalloc()ed */
u_short scrollmode; /* Scroll Method */
u_short inverse; /* != 0 text black on white as default */ u_short inverse; /* != 0 text black on white as default */
short yscroll; /* Hardware scrolling */ short yscroll; /* Hardware scrolling */
int vrows; /* number of virtual rows */ int vrows; /* number of virtual rows */
...@@ -51,6 +52,8 @@ struct fbcon_display { ...@@ -51,6 +52,8 @@ struct fbcon_display {
}; };
struct fbcon_ops { struct fbcon_ops {
void (*bmove)(struct vc_data *vc, struct fb_info *info, int sy,
int sx, int dy, int dx, int height, int width);
void (*clear)(struct vc_data *vc, struct fb_info *info, int sy, void (*clear)(struct vc_data *vc, struct fb_info *info, int sy,
int sx, int height, int width); int sx, int height, int width);
void (*putcs)(struct vc_data *vc, struct fb_info *info, void (*putcs)(struct vc_data *vc, struct fb_info *info,
...@@ -149,6 +152,62 @@ static inline int attr_col_ec(int shift, struct vc_data *vc, ...@@ -149,6 +152,62 @@ static inline int attr_col_ec(int shift, struct vc_data *vc,
#define attr_bgcol_ec(bgshift, vc, info) attr_col_ec(bgshift, vc, info, 0) #define attr_bgcol_ec(bgshift, vc, info) attr_col_ec(bgshift, vc, info, 0)
#define attr_fgcol_ec(fgshift, vc, info) attr_col_ec(fgshift, vc, info, 1) #define attr_fgcol_ec(fgshift, vc, info) attr_col_ec(fgshift, vc, info, 1)
/*
* Scroll Method
*/
/* There are several methods fbcon can use to move text around the screen:
*
* Operation Pan Wrap
*---------------------------------------------
* SCROLL_MOVE copyarea No No
* SCROLL_PAN_MOVE copyarea Yes No
* SCROLL_WRAP_MOVE copyarea No Yes
* SCROLL_REDRAW imageblit No No
* SCROLL_PAN_REDRAW imageblit Yes No
* SCROLL_WRAP_REDRAW imageblit No Yes
*
* (SCROLL_WRAP_REDRAW is not implemented yet)
*
* In general, fbcon will choose the best scrolling
* method based on the rule below:
*
* Pan/Wrap > accel imageblit > accel copyarea >
* soft imageblit > (soft copyarea)
*
* Exception to the rule: Pan + accel copyarea is
* preferred over Pan + accel imageblit.
*
* The above is typical for PCI/AGP cards. Unless
* overridden, fbcon will never use soft copyarea.
*
* If you need to override the above rule, set the
* appropriate flags in fb_info->flags. For example,
* to prefer copyarea over imageblit, set
* FBINFO_READS_FAST.
*
* Other notes:
* + use the hardware engine to move the text
* (hw-accelerated copyarea() and fillrect())
* + use hardware-supported panning on a large virtual screen
* + amifb can not only pan, but also wrap the display by N lines
* (i.e. visible line i = physical line (i+N) % yres).
* + read what's already rendered on the screen and
* write it in a different place (this is cfb_copyarea())
* + re-render the text to the screen
*
* Whether to use wrapping or panning can only be figured out at
* runtime (when we know whether our font height is a multiple
* of the pan/wrap step)
*
*/
#define SCROLL_MOVE 0x001
#define SCROLL_PAN_MOVE 0x002
#define SCROLL_WRAP_MOVE 0x003
#define SCROLL_REDRAW 0x004
#define SCROLL_PAN_REDRAW 0x005
#ifdef CONFIG_FB_TILEBLITTING #ifdef CONFIG_FB_TILEBLITTING
extern void fbcon_set_tileops(struct vc_data *vc, struct fb_info *info); extern void fbcon_set_tileops(struct vc_data *vc, struct fb_info *info);
#endif #endif
......
...@@ -59,12 +59,31 @@ static void ccw_update_attr(u8 *dst, u8 *src, int attribute, ...@@ -59,12 +59,31 @@ static void ccw_update_attr(u8 *dst, u8 *src, int attribute,
} }
} }
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, static void ccw_clear(struct vc_data *vc, struct fb_info *info, int sy,
int sx, int height, int width) int sx, int height, int width)
{ {
struct fbcon_ops *ops = info->fbcon_par;
struct fb_fillrect region; struct fb_fillrect region;
int bgshift = (vc->vc_hi_font_mask) ? 13 : 12; int bgshift = (vc->vc_hi_font_mask) ? 13 : 12;
u32 vyres = info->var.yres; u32 vyres = GETVYRES(ops->p->scrollmode, info);
region.color = attr_bgcol_ec(bgshift,vc,info); region.color = attr_bgcol_ec(bgshift,vc,info);
region.dx = sy * vc->vc_font.height; region.dx = sy * vc->vc_font.height;
...@@ -121,7 +140,7 @@ static void ccw_putcs(struct vc_data *vc, struct fb_info *info, ...@@ -121,7 +140,7 @@ static void ccw_putcs(struct vc_data *vc, struct fb_info *info,
u32 cnt, pitch, size; u32 cnt, pitch, size;
u32 attribute = get_attribute(info, scr_readw(s)); u32 attribute = get_attribute(info, scr_readw(s));
u8 *dst, *buf = NULL; u8 *dst, *buf = NULL;
u32 vyres = info->var.yres; u32 vyres = GETVYRES(ops->p->scrollmode, info);
if (!ops->fontbuffer) if (!ops->fontbuffer)
return; return;
...@@ -210,7 +229,7 @@ static void ccw_cursor(struct vc_data *vc, struct fb_info *info, int mode, ...@@ -210,7 +229,7 @@ static void ccw_cursor(struct vc_data *vc, struct fb_info *info, int mode,
int attribute, use_sw = vc->vc_cursor_type & CUR_SW; int attribute, use_sw = vc->vc_cursor_type & CUR_SW;
int err = 1, dx, dy; int err = 1, dx, dy;
char *src; char *src;
u32 vyres = info->var.yres; u32 vyres = GETVYRES(ops->p->scrollmode, info);
if (!ops->fontbuffer) if (!ops->fontbuffer)
return; return;
...@@ -368,7 +387,7 @@ static int ccw_update_start(struct fb_info *info) ...@@ -368,7 +387,7 @@ static int ccw_update_start(struct fb_info *info)
{ {
struct fbcon_ops *ops = info->fbcon_par; struct fbcon_ops *ops = info->fbcon_par;
u32 yoffset; u32 yoffset;
u32 vyres = info->var.yres; u32 vyres = GETVYRES(ops->p->scrollmode, info);
int err; int err;
yoffset = (vyres - info->var.yres) - ops->var.xoffset; yoffset = (vyres - info->var.yres) - ops->var.xoffset;
...@@ -383,6 +402,7 @@ static int ccw_update_start(struct fb_info *info) ...@@ -383,6 +402,7 @@ static int ccw_update_start(struct fb_info *info)
void fbcon_rotate_ccw(struct fbcon_ops *ops) void fbcon_rotate_ccw(struct fbcon_ops *ops)
{ {
ops->bmove = ccw_bmove;
ops->clear = ccw_clear; ops->clear = ccw_clear;
ops->putcs = ccw_putcs; ops->putcs = ccw_putcs;
ops->clear_margins = ccw_clear_margins; ops->clear_margins = ccw_clear_margins;
......
...@@ -44,12 +44,31 @@ static void cw_update_attr(u8 *dst, u8 *src, int attribute, ...@@ -44,12 +44,31 @@ static void cw_update_attr(u8 *dst, u8 *src, int attribute,
} }
} }
static void cw_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 vxres = GETVXRES(ops->p->scrollmode, info);
area.sx = vxres - ((sy + height) * vc->vc_font.height);
area.sy = sx * vc->vc_font.width;
area.dx = vxres - ((dy + height) * vc->vc_font.height);
area.dy = dx * 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 cw_clear(struct vc_data *vc, struct fb_info *info, int sy, static void cw_clear(struct vc_data *vc, struct fb_info *info, int sy,
int sx, int height, int width) int sx, int height, int width)
{ {
struct fbcon_ops *ops = info->fbcon_par;
struct fb_fillrect region; struct fb_fillrect region;
int bgshift = (vc->vc_hi_font_mask) ? 13 : 12; int bgshift = (vc->vc_hi_font_mask) ? 13 : 12;
u32 vxres = info->var.xres; u32 vxres = GETVXRES(ops->p->scrollmode, info);
region.color = attr_bgcol_ec(bgshift,vc,info); region.color = attr_bgcol_ec(bgshift,vc,info);
region.dx = vxres - ((sy + height) * vc->vc_font.height); region.dx = vxres - ((sy + height) * vc->vc_font.height);
...@@ -106,7 +125,7 @@ static void cw_putcs(struct vc_data *vc, struct fb_info *info, ...@@ -106,7 +125,7 @@ static void cw_putcs(struct vc_data *vc, struct fb_info *info,
u32 cnt, pitch, size; u32 cnt, pitch, size;
u32 attribute = get_attribute(info, scr_readw(s)); u32 attribute = get_attribute(info, scr_readw(s));
u8 *dst, *buf = NULL; u8 *dst, *buf = NULL;
u32 vxres = info->var.xres; u32 vxres = GETVXRES(ops->p->scrollmode, info);
if (!ops->fontbuffer) if (!ops->fontbuffer)
return; return;
...@@ -193,7 +212,7 @@ static void cw_cursor(struct vc_data *vc, struct fb_info *info, int mode, ...@@ -193,7 +212,7 @@ static void cw_cursor(struct vc_data *vc, struct fb_info *info, int mode,
int attribute, use_sw = vc->vc_cursor_type & CUR_SW; int attribute, use_sw = vc->vc_cursor_type & CUR_SW;
int err = 1, dx, dy; int err = 1, dx, dy;
char *src; char *src;
u32 vxres = info->var.xres; u32 vxres = GETVXRES(ops->p->scrollmode, info);
if (!ops->fontbuffer) if (!ops->fontbuffer)
return; return;
...@@ -350,7 +369,7 @@ static void cw_cursor(struct vc_data *vc, struct fb_info *info, int mode, ...@@ -350,7 +369,7 @@ static void cw_cursor(struct vc_data *vc, struct fb_info *info, int mode,
static int cw_update_start(struct fb_info *info) static int cw_update_start(struct fb_info *info)
{ {
struct fbcon_ops *ops = info->fbcon_par; struct fbcon_ops *ops = info->fbcon_par;
u32 vxres = info->var.xres; u32 vxres = GETVXRES(ops->p->scrollmode, info);
u32 xoffset; u32 xoffset;
int err; int err;
...@@ -366,6 +385,7 @@ static int cw_update_start(struct fb_info *info) ...@@ -366,6 +385,7 @@ static int cw_update_start(struct fb_info *info)
void fbcon_rotate_cw(struct fbcon_ops *ops) void fbcon_rotate_cw(struct fbcon_ops *ops)
{ {
ops->bmove = cw_bmove;
ops->clear = cw_clear; ops->clear = cw_clear;
ops->putcs = cw_putcs; ops->putcs = cw_putcs;
ops->clear_margins = cw_clear_margins; ops->clear_margins = cw_clear_margins;
......
...@@ -11,6 +11,15 @@ ...@@ -11,6 +11,15 @@
#ifndef _FBCON_ROTATE_H #ifndef _FBCON_ROTATE_H
#define _FBCON_ROTATE_H #define _FBCON_ROTATE_H
#define GETVYRES(s,i) ({ \
(s == SCROLL_REDRAW || s == SCROLL_MOVE) ? \
(i)->var.yres : (i)->var.yres_virtual; })
#define GETVXRES(s,i) ({ \
(s == SCROLL_REDRAW || s == SCROLL_MOVE || !(i)->fix.xpanstep) ? \
(i)->var.xres : (i)->var.xres_virtual; })
static inline int pattern_test_bit(u32 x, u32 y, u32 pitch, const char *pat) static inline int pattern_test_bit(u32 x, u32 y, u32 pitch, const char *pat)
{ {
u32 tmp = (y * pitch) + x, index = tmp / 8, bit = tmp % 8; u32 tmp = (y * pitch) + x, index = tmp / 8, bit = tmp % 8;
......
...@@ -44,13 +44,33 @@ static void ud_update_attr(u8 *dst, u8 *src, int attribute, ...@@ -44,13 +44,33 @@ static void ud_update_attr(u8 *dst, u8 *src, int attribute,
} }
} }
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->scrollmode, info);
u32 vxres = GETVXRES(ops->p->scrollmode, 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, static void ud_clear(struct vc_data *vc, struct fb_info *info, int sy,
int sx, int height, int width) int sx, int height, int width)
{ {
struct fbcon_ops *ops = info->fbcon_par;
struct fb_fillrect region; struct fb_fillrect region;
int bgshift = (vc->vc_hi_font_mask) ? 13 : 12; int bgshift = (vc->vc_hi_font_mask) ? 13 : 12;
u32 vyres = info->var.yres; u32 vyres = GETVYRES(ops->p->scrollmode, info);
u32 vxres = info->var.xres; u32 vxres = GETVXRES(ops->p->scrollmode, info);
region.color = attr_bgcol_ec(bgshift,vc,info); region.color = attr_bgcol_ec(bgshift,vc,info);
region.dy = vyres - ((sy + height) * vc->vc_font.height); region.dy = vyres - ((sy + height) * vc->vc_font.height);
...@@ -142,8 +162,8 @@ static void ud_putcs(struct vc_data *vc, struct fb_info *info, ...@@ -142,8 +162,8 @@ static void ud_putcs(struct vc_data *vc, struct fb_info *info,
u32 mod = vc->vc_font.width % 8, cnt, pitch, size; u32 mod = vc->vc_font.width % 8, cnt, pitch, size;
u32 attribute = get_attribute(info, scr_readw(s)); u32 attribute = get_attribute(info, scr_readw(s));
u8 *dst, *buf = NULL; u8 *dst, *buf = NULL;
u32 vyres = info->var.yres; u32 vyres = GETVYRES(ops->p->scrollmode, info);
u32 vxres = info->var.xres; u32 vxres = GETVXRES(ops->p->scrollmode, info);
if (!ops->fontbuffer) if (!ops->fontbuffer)
return; return;
...@@ -239,8 +259,8 @@ static void ud_cursor(struct vc_data *vc, struct fb_info *info, int mode, ...@@ -239,8 +259,8 @@ static void ud_cursor(struct vc_data *vc, struct fb_info *info, int mode,
int attribute, use_sw = vc->vc_cursor_type & CUR_SW; int attribute, use_sw = vc->vc_cursor_type & CUR_SW;
int err = 1, dx, dy; int err = 1, dx, dy;
char *src; char *src;
u32 vyres = info->var.yres; u32 vyres = GETVYRES(ops->p->scrollmode, info);
u32 vxres = info->var.xres; u32 vxres = GETVXRES(ops->p->scrollmode, info);
if (!ops->fontbuffer) if (!ops->fontbuffer)
return; return;
...@@ -390,8 +410,8 @@ static int ud_update_start(struct fb_info *info) ...@@ -390,8 +410,8 @@ static int ud_update_start(struct fb_info *info)
{ {
struct fbcon_ops *ops = info->fbcon_par; struct fbcon_ops *ops = info->fbcon_par;
int xoffset, yoffset; int xoffset, yoffset;
u32 vyres = info->var.yres; u32 vyres = GETVYRES(ops->p->scrollmode, info);
u32 vxres = info->var.xres; u32 vxres = GETVXRES(ops->p->scrollmode, info);
int err; int err;
xoffset = vxres - info->var.xres - ops->var.xoffset; xoffset = vxres - info->var.xres - ops->var.xoffset;
...@@ -409,6 +429,7 @@ static int ud_update_start(struct fb_info *info) ...@@ -409,6 +429,7 @@ static int ud_update_start(struct fb_info *info)
void fbcon_rotate_ud(struct fbcon_ops *ops) void fbcon_rotate_ud(struct fbcon_ops *ops)
{ {
ops->bmove = ud_bmove;
ops->clear = ud_clear; ops->clear = ud_clear;
ops->putcs = ud_putcs; ops->putcs = ud_putcs;
ops->clear_margins = ud_clear_margins; ops->clear_margins = ud_clear_margins;
......
...@@ -16,6 +16,21 @@ ...@@ -16,6 +16,21 @@
#include <asm/types.h> #include <asm/types.h>
#include "fbcon.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, static void tile_clear(struct vc_data *vc, struct fb_info *info, int sy,
int sx, int height, int width) int sx, int height, int width)
{ {
...@@ -118,6 +133,7 @@ void fbcon_set_tileops(struct vc_data *vc, struct fb_info *info) ...@@ -118,6 +133,7 @@ void fbcon_set_tileops(struct vc_data *vc, struct fb_info *info)
struct fb_tilemap map; struct fb_tilemap map;
struct fbcon_ops *ops = info->fbcon_par; struct fbcon_ops *ops = info->fbcon_par;
ops->bmove = tile_bmove;
ops->clear = tile_clear; ops->clear = tile_clear;
ops->putcs = tile_putcs; ops->putcs = tile_putcs;
ops->clear_margins = tile_clear_margins; ops->clear_margins = tile_clear_margins;
......
...@@ -505,15 +505,15 @@ void xxxfb_fillrect(struct fb_info *p, const struct fb_fillrect *region) ...@@ -505,15 +505,15 @@ void xxxfb_fillrect(struct fb_info *p, const struct fb_fillrect *region)
} }
/** /**
* xxxfb_copyarea - OBSOLETE function. * xxxfb_copyarea - REQUIRED function. Can use generic routines if
* non acclerated hardware and packed pixel based.
* Copies one area of the screen to another area. * Copies one area of the screen to another area.
* Will be deleted in a future version
* *
* @info: frame buffer structure that represents a single frame buffer * @info: frame buffer structure that represents a single frame buffer
* @area: Structure providing the data to copy the framebuffer contents * @area: Structure providing the data to copy the framebuffer contents
* from one region to another. * from one region to another.
* *
* This drawing operation copied a rectangular area from one area of the * This drawing operation copies a rectangular area from one area of the
* screen to another area. * screen to another area.
*/ */
void xxxfb_copyarea(struct fb_info *p, const struct fb_copyarea *area) void xxxfb_copyarea(struct fb_info *p, const struct fb_copyarea *area)
...@@ -646,7 +646,7 @@ static const struct fb_ops xxxfb_ops = { ...@@ -646,7 +646,7 @@ static const struct fb_ops xxxfb_ops = {
.fb_blank = xxxfb_blank, .fb_blank = xxxfb_blank,
.fb_pan_display = xxxfb_pan_display, .fb_pan_display = xxxfb_pan_display,
.fb_fillrect = xxxfb_fillrect, /* Needed !!! */ .fb_fillrect = xxxfb_fillrect, /* Needed !!! */
.fb_copyarea = xxxfb_copyarea, /* Obsolete */ .fb_copyarea = xxxfb_copyarea, /* Needed !!! */
.fb_imageblit = xxxfb_imageblit, /* Needed !!! */ .fb_imageblit = xxxfb_imageblit, /* Needed !!! */
.fb_cursor = xxxfb_cursor, /* Optional !!! */ .fb_cursor = xxxfb_cursor, /* Optional !!! */
.fb_sync = xxxfb_sync, .fb_sync = xxxfb_sync,
......
...@@ -262,7 +262,7 @@ struct fb_ops { ...@@ -262,7 +262,7 @@ struct fb_ops {
/* Draws a rectangle */ /* Draws a rectangle */
void (*fb_fillrect) (struct fb_info *info, const struct fb_fillrect *rect); void (*fb_fillrect) (struct fb_info *info, const struct fb_fillrect *rect);
/* Copy data from area to another. Obsolete. */ /* Copy data from area to another */
void (*fb_copyarea) (struct fb_info *info, const struct fb_copyarea *region); void (*fb_copyarea) (struct fb_info *info, const struct fb_copyarea *region);
/* Draws a image to the display */ /* Draws a image to the display */
void (*fb_imageblit) (struct fb_info *info, const struct fb_image *image); void (*fb_imageblit) (struct fb_info *info, const struct fb_image *image);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment