1148836fd3
This reverts commit b3ec8cdf457e5e63d396fe1346cc788cf7c1b578. 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 973c096f6a85). 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: Helge Deller <deller@gmx.de> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Acked-by: Sven Schnelle <svens@stackframe.org> Cc: stable@vger.kernel.org # v5.16+ Signed-off-by: Helge Deller <deller@gmx.de> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: https://patchwork.freedesktop.org/patch/msgid/20220202135531.92183-2-deller@gmx.de
152 lines
3.6 KiB
C
152 lines
3.6 KiB
C
/*
|
|
* linux/drivers/video/console/tileblit.c -- Tile Blitting Operation
|
|
*
|
|
* Copyright (C) 2004 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/string.h>
|
|
#include <linux/fb.h>
|
|
#include <linux/vt_kern.h>
|
|
#include <linux/console.h>
|
|
#include <asm/types.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,
|
|
int sx, int height, int width)
|
|
{
|
|
struct fb_tilerect rect;
|
|
int bgshift = (vc->vc_hi_font_mask) ? 13 : 12;
|
|
int fgshift = (vc->vc_hi_font_mask) ? 9 : 8;
|
|
|
|
rect.index = vc->vc_video_erase_char &
|
|
((vc->vc_hi_font_mask) ? 0x1ff : 0xff);
|
|
rect.fg = attr_fgcol_ec(fgshift, vc, info);
|
|
rect.bg = attr_bgcol_ec(bgshift, vc, info);
|
|
rect.sx = sx;
|
|
rect.sy = sy;
|
|
rect.width = width;
|
|
rect.height = height;
|
|
rect.rop = ROP_COPY;
|
|
|
|
info->tileops->fb_tilefill(info, &rect);
|
|
}
|
|
|
|
static void tile_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_tileblit blit;
|
|
unsigned short charmask = vc->vc_hi_font_mask ? 0x1ff : 0xff;
|
|
int size = sizeof(u32) * count, i;
|
|
|
|
blit.sx = xx;
|
|
blit.sy = yy;
|
|
blit.width = count;
|
|
blit.height = 1;
|
|
blit.fg = fg;
|
|
blit.bg = bg;
|
|
blit.length = count;
|
|
blit.indices = (u32 *) fb_get_buffer_offset(info, &info->pixmap, size);
|
|
for (i = 0; i < count; i++)
|
|
blit.indices[i] = (u32)(scr_readw(s++) & charmask);
|
|
|
|
info->tileops->fb_tileblit(info, &blit);
|
|
}
|
|
|
|
static void tile_clear_margins(struct vc_data *vc, struct fb_info *info,
|
|
int color, int bottom_only)
|
|
{
|
|
return;
|
|
}
|
|
|
|
static void tile_cursor(struct vc_data *vc, struct fb_info *info, int mode,
|
|
int fg, int bg)
|
|
{
|
|
struct fb_tilecursor cursor;
|
|
int use_sw = vc->vc_cursor_type & CUR_SW;
|
|
|
|
cursor.sx = vc->state.x;
|
|
cursor.sy = vc->state.y;
|
|
cursor.mode = (mode == CM_ERASE || use_sw) ? 0 : 1;
|
|
cursor.fg = fg;
|
|
cursor.bg = bg;
|
|
|
|
switch (vc->vc_cursor_type & 0x0f) {
|
|
case CUR_NONE:
|
|
cursor.shape = FB_TILE_CURSOR_NONE;
|
|
break;
|
|
case CUR_UNDERLINE:
|
|
cursor.shape = FB_TILE_CURSOR_UNDERLINE;
|
|
break;
|
|
case CUR_LOWER_THIRD:
|
|
cursor.shape = FB_TILE_CURSOR_LOWER_THIRD;
|
|
break;
|
|
case CUR_LOWER_HALF:
|
|
cursor.shape = FB_TILE_CURSOR_LOWER_HALF;
|
|
break;
|
|
case CUR_TWO_THIRDS:
|
|
cursor.shape = FB_TILE_CURSOR_TWO_THIRDS;
|
|
break;
|
|
case CUR_BLOCK:
|
|
default:
|
|
cursor.shape = FB_TILE_CURSOR_BLOCK;
|
|
break;
|
|
}
|
|
|
|
info->tileops->fb_tilecursor(info, &cursor);
|
|
}
|
|
|
|
static int tile_update_start(struct fb_info *info)
|
|
{
|
|
struct fbcon_ops *ops = info->fbcon_par;
|
|
int err;
|
|
|
|
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_set_tileops(struct vc_data *vc, struct fb_info *info)
|
|
{
|
|
struct fb_tilemap map;
|
|
struct fbcon_ops *ops = info->fbcon_par;
|
|
|
|
ops->bmove = tile_bmove;
|
|
ops->clear = tile_clear;
|
|
ops->putcs = tile_putcs;
|
|
ops->clear_margins = tile_clear_margins;
|
|
ops->cursor = tile_cursor;
|
|
ops->update_start = tile_update_start;
|
|
|
|
if (ops->p) {
|
|
map.width = vc->vc_font.width;
|
|
map.height = vc->vc_font.height;
|
|
map.depth = 1;
|
|
map.length = vc->vc_font.charcount;
|
|
map.data = ops->p->fontdata;
|
|
info->tileops->fb_settile(info, &map);
|
|
}
|
|
}
|