video: Avoid starting a new line to close to the bottom

When starting a new text line, an assumption is made that the current
vertical position is a multiple of the character height. When this is
not true, characters can be written after the end of the framebuffer.

This can causes crashes and strange errors from QEMU.

Adjust the scrolling check when processing a newline character, to
avoid any problems.

Add some comments to make things a little clearer.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/drivers/video/vidconsole-uclass.c b/drivers/video/vidconsole-uclass.c
index 80e7adf6a1a4fd42ec00e56fd1254ece1382e42d..ebe96bf0c2f38299f549d6eb2773f1049012d9fc 100644 (file)
--- a/drivers/video/vidconsole-uclass.c
+++ b/drivers/video/vidconsole-uclass.c
@@ -94,7 +94,9 @@ static void vidconsole_newline(struct udevice *dev)
        priv->ycur += priv->y_charsize;
 
        /* Check if we need to scroll the terminal */
-       if ((priv->ycur + priv->y_charsize) / priv->y_charsize > priv->rows) {
+       if (vid_priv->rot % 2 ?
+           priv->ycur + priv->x_charsize > vid_priv->xsize :
+           priv->ycur + priv->y_charsize > vid_priv->ysize) {
                vidconsole_move_rows(dev, 0, rows, priv->rows - rows);
                for (i = 0; i < rows; i++)
                        vidconsole_set_row(dev, priv->rows - i - 1,

diff --git a/include/video.h b/include/video.h
index fd19723b1d2627c99efaffe48c246c9243ce6d4f..c7afe22d823a22e39b3ad8e5c0aab83e918817c2 100644 (file)
--- a/include/video.h
+++ b/include/video.h
@@ -78,7 +78,8 @@ enum video_format {
  *
  * @xsize:     Number of pixel columns (e.g. 1366)
  * @ysize:     Number of pixels rows (e.g.. 768)
- * @rot:       Display rotation (0=none, 1=90 degrees clockwise, etc.)
+ * @rot:       Display rotation (0=none, 1=90 degrees clockwise, etc.). THis
+ *             does not affect @xsize and @ysize
  * @bpix:      Encoded bits per pixel (enum video_log2_bpp)
  * @format:    Pixel format (enum video_format)
  * @vidconsole_drv_name:       Driver to use for the text console, NULL to

diff --git a/include/video_console.h b/include/video_console.h
index 8b5928dc5ebbfe30334f1b6e6f5e704fffecea33..723d2315606d368f9a9d7ed906feb9a2566a4019 100644 (file)
--- a/include/video_console.h
+++ b/include/video_console.h
@@ -27,6 +27,14 @@ enum {
  * Drivers must set up @rows, @cols, @x_charsize, @y_charsize in their probe()
  * method. Drivers may set up @xstart_frac if desired.
  *
+ * Note that these values relate to the rotated console, so that an 80x25
+ * console which is rotated 90 degrees will have rows=80 and cols=25
+ *
+ * The xcur_frac and ycur values refer to the unrotated coordinates, that is
+ * xcur_frac always advances with each character, even if its limit might be
+ * vid_priv->ysize instead of vid_priv->xsize if the console is rotated 90 or
+ * 270 degrees.
+ *
  * @sdev:              stdio device, acting as an output sink
  * @xcur_frac:         Current X position, in fractional units (VID_TO_POS(x))
  * @ycur:              Current Y position in pixels (0=top)