mirror of
https://source.denx.de/u-boot/u-boot.git
synced 2025-08-16 12:16:59 +02:00
CONFIG_VIDEO_COPY implemented a range-based copying mechanism: If we print a single character, it will always copy the full range of bytes from the top left corner of the character to the lower right onto the uncached frame buffer. This includes pretty much the full line contents of the printed character. Since we now have proper damage tracking, let's make use of that to reduce the amount of data we need to copy. With this patch applied, we will only copy the tiny rectangle surrounding characters when we print them, speeding up the video console. After this, changes to the main frame buffer are not immediately copied to the copy frame buffer, but postponed until the next video device sync. So issue an explicit sync before inspecting the copy frame buffer contents for the video tests. Signed-off-by: Alexander Graf <agraf@csgraf.de> [Alper: Rebase for fontdata->height/w, fill_part(), fix memmove(dev), drop from defconfig, use damage.xstart/yend, use IS_ENABLED(), call video_sync() before copy_fb check, update video_copy test] Co-developed-by: Alper Nebi Yasak <alpernebiyasak@gmail.com> Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com> Link: https://lore.kernel.org/u-boot/20230821135111.3558478-12-alpernebiyasak@gmail.com/
153 lines
4.2 KiB
C
153 lines
4.2 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* Copyright (c) 2015 Google, Inc
|
|
* (C) Copyright 2015
|
|
* Bernecker & Rainer Industrieelektronik GmbH - http://www.br-automation.com
|
|
* (C) Copyright 2023 Dzmitry Sankouski <dsankouski@gmail.com>
|
|
*/
|
|
|
|
#include <charset.h>
|
|
#include <dm.h>
|
|
#include <video.h>
|
|
#include <video_console.h>
|
|
#include <video_font.h> /* Get font data, width and height */
|
|
#include "vidconsole_internal.h"
|
|
|
|
static int console_set_row(struct udevice *dev, uint row, int clr)
|
|
{
|
|
struct video_priv *vid_priv = dev_get_uclass_priv(dev->parent);
|
|
struct console_simple_priv *priv = dev_get_priv(dev);
|
|
struct video_fontdata *fontdata = priv->fontdata;
|
|
void *line, *dst, *end;
|
|
int pixels = fontdata->height * vid_priv->xsize;
|
|
int ret;
|
|
int i;
|
|
int pbytes;
|
|
|
|
ret = check_bpix_support(vid_priv->bpix);
|
|
if (ret)
|
|
return ret;
|
|
|
|
line = vid_priv->fb + row * fontdata->height * vid_priv->line_length;
|
|
dst = line;
|
|
pbytes = VNBYTES(vid_priv->bpix);
|
|
for (i = 0; i < pixels; i++)
|
|
fill_pixel_and_goto_next(&dst, clr, pbytes, pbytes);
|
|
end = dst;
|
|
|
|
video_damage(dev->parent,
|
|
0,
|
|
fontdata->height * row,
|
|
vid_priv->xsize,
|
|
fontdata->height);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int console_move_rows(struct udevice *dev, uint rowdst,
|
|
uint rowsrc, uint count)
|
|
{
|
|
struct video_priv *vid_priv = dev_get_uclass_priv(dev->parent);
|
|
struct console_simple_priv *priv = dev_get_priv(dev);
|
|
struct video_fontdata *fontdata = priv->fontdata;
|
|
void *dst;
|
|
void *src;
|
|
int size;
|
|
|
|
dst = vid_priv->fb + rowdst * fontdata->height * vid_priv->line_length;
|
|
src = vid_priv->fb + rowsrc * fontdata->height * vid_priv->line_length;
|
|
size = fontdata->height * vid_priv->line_length * count;
|
|
memmove(dst, src, size);
|
|
|
|
video_damage(dev->parent,
|
|
0,
|
|
fontdata->height * rowdst,
|
|
vid_priv->xsize,
|
|
fontdata->height * count);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int console_putc_xy(struct udevice *dev, uint x_frac, uint y, int cp)
|
|
{
|
|
struct vidconsole_priv *vc_priv = dev_get_uclass_priv(dev);
|
|
struct udevice *vid = dev->parent;
|
|
struct video_priv *vid_priv = dev_get_uclass_priv(vid);
|
|
struct console_simple_priv *priv = dev_get_priv(dev);
|
|
struct video_fontdata *fontdata = priv->fontdata;
|
|
int pbytes = VNBYTES(vid_priv->bpix);
|
|
int x, linenum, ret;
|
|
void *start, *line;
|
|
u8 ch = console_utf_to_cp437(cp);
|
|
uchar *pfont = fontdata->video_fontdata +
|
|
ch * fontdata->char_pixel_bytes;
|
|
|
|
if (x_frac + VID_TO_POS(vc_priv->x_charsize) > vc_priv->xsize_frac)
|
|
return -EAGAIN;
|
|
linenum = y;
|
|
x = VID_TO_PIXEL(x_frac);
|
|
start = vid_priv->fb + linenum * vid_priv->line_length + x * pbytes;
|
|
line = start;
|
|
|
|
if (x_frac + VID_TO_POS(vc_priv->x_charsize) > vc_priv->xsize_frac)
|
|
return -EAGAIN;
|
|
|
|
ret = fill_char_vertically(pfont, &line, vid_priv, fontdata, NORMAL_DIRECTION);
|
|
if (ret)
|
|
return ret;
|
|
|
|
video_damage(dev->parent,
|
|
x,
|
|
y,
|
|
fontdata->width,
|
|
fontdata->height);
|
|
|
|
return VID_TO_POS(fontdata->width);
|
|
}
|
|
|
|
static int console_set_cursor_visible(struct udevice *dev, bool visible,
|
|
uint x, uint y, uint index)
|
|
{
|
|
struct vidconsole_priv *vc_priv = dev_get_uclass_priv(dev);
|
|
struct udevice *vid = dev->parent;
|
|
struct video_priv *vid_priv = dev_get_uclass_priv(vid);
|
|
struct console_simple_priv *priv = dev_get_priv(dev);
|
|
struct video_fontdata *fontdata = priv->fontdata;
|
|
int pbytes = VNBYTES(vid_priv->bpix);
|
|
void *start, *line;
|
|
|
|
/* for now, this is not used outside expo */
|
|
if (!IS_ENABLED(CONFIG_EXPO))
|
|
return -ENOSYS;
|
|
|
|
x += index * fontdata->width;
|
|
start = vid_priv->fb + y * vid_priv->line_length + x * pbytes;
|
|
|
|
/* place the cursor 1 pixel before the start of the next char */
|
|
x -= 1;
|
|
|
|
line = start;
|
|
draw_cursor_vertically(&line, vid_priv, vc_priv->y_charsize,
|
|
NORMAL_DIRECTION);
|
|
|
|
return 0;
|
|
}
|
|
|
|
struct vidconsole_ops console_ops = {
|
|
.putc_xy = console_putc_xy,
|
|
.move_rows = console_move_rows,
|
|
.set_row = console_set_row,
|
|
.get_font_size = console_simple_get_font_size,
|
|
.get_font = console_simple_get_font,
|
|
.select_font = console_simple_select_font,
|
|
.set_cursor_visible = console_set_cursor_visible,
|
|
};
|
|
|
|
U_BOOT_DRIVER(vidconsole_normal) = {
|
|
.name = "vidconsole0",
|
|
.id = UCLASS_VIDEO_CONSOLE,
|
|
.ops = &console_ops,
|
|
.probe = console_probe,
|
|
.priv_auto = sizeof(struct console_simple_priv),
|
|
};
|