diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2020-09-17 15:45:05 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2020-09-17 15:45:05 -0300 |
| commit | 056c1722014104b70d36fe71b683f71637f1a708 (patch) | |
| tree | 8236ab2e3f32d9dd2f82ca6045a6f82bd1b0d1e9 /drivers/video/fbdev/core/bitblit.c | |
| parent | 8366f0d268c20929d82d4b1407bd4c6f9232bdec (diff) | |
| parent | 5925fa68fe8244651b3f78a88c4af99190a88f0d (diff) | |
| download | linux-056c1722014104b70d36fe71b683f71637f1a708.tar.bz2 | |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'drivers/video/fbdev/core/bitblit.c')
| -rw-r--r-- | drivers/video/fbdev/core/bitblit.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/video/fbdev/core/bitblit.c b/drivers/video/fbdev/core/bitblit.c index 4e6cbc24346d..9725ecd1255b 100644 --- a/drivers/video/fbdev/core/bitblit.c +++ b/drivers/video/fbdev/core/bitblit.c @@ -234,7 +234,7 @@ static void bit_clear_margins(struct vc_data *vc, struct fb_info *info, } static void bit_cursor(struct vc_data *vc, struct fb_info *info, int mode, - int softback_lines, int fg, int bg) + int fg, int bg) { struct fb_cursor cursor; struct fbcon_ops *ops = info->fbcon_par; @@ -247,15 +247,6 @@ static void bit_cursor(struct vc_data *vc, struct fb_info *info, int mode, 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 = vc->vc_font.data + ((c & charmask) * (w * vc->vc_font.height)); |