Skip to contentSkip to conversation

Revert 9f62a472dfb2 ("video: Remove duplicate cursor-positioning function")

PATCH In review Tom Rini 2 participants 5 messages Mar 15, 2023 – Apr 2, 2023 Framebuffer layer

lore
Share & tools
lore

Tom Rini

author
#0 lore raw

PATCH 1/1 Revert 9f62a472dfb2 ("video: Remove duplicate cursor-positioning function")

This reverts commit 9f62a472dfb26ec14408a27938ddd2a25700009d.

The changes here aren't quite right, and on platforms such as Raspberry Pi where we can have both serial and video output, the change above causes output to change. This can be seen as the hush tests we have now fail.

---
Cc: Simon Glass <[email protected]>

Some other issues in my lab meant I thought I had tested this platform when I took the PR in originally, but hadn't. So I'd like to grab this ASAP.

---
 drivers/video/vidconsole-uclass.c | 44 ++++++++++++++++++++++++-------
 1 file changed, 34 insertions(+), 10 deletions(-)
drivers/video/vidconsole-uclass.c +34 -10
index 61f4216750f2..1225de233325 100644
@@ -126,14 +126,26 @@ void vidconsole_set_cursor_pos(struct udevice *dev, int x, int y)
 	priv->ycur = y;
 }
 
-void vidconsole_position_cursor(struct udevice *dev, uint col, uint row)
+/**
+ * set_cursor_position() - set cursor position
+ *
+ * @priv:	private data of the video console
+ * @row:	new row
+ * @col:	new column
+ */
+static void set_cursor_position(struct vidconsole_priv *priv, int row, int col)
 {
-	struct vidconsole_priv *priv = dev_get_uclass_priv(dev);
-	short x, y;
-
-	x = min_t(short, col, priv->cols - 1) * priv->x_charsize;
-	y = min_t(short, row, priv->rows - 1) * priv->y_charsize;
-	vidconsole_set_cursor_pos(dev, x, y);
+	/*
+	 * Ensure we stay in the bounds of the screen.
+	 */
+	if (row >= priv->rows)
+		row = priv->rows - 1;
+	if (col >= priv->cols)
+		col = priv->cols - 1;
+
+	priv->ycur = row * priv->y_charsize;
+	priv->xcur_frac = priv->xstart_frac +
+			  VID_TO_POS(col * priv->x_charsize);
 }
 
 /**
@@ -180,7 +192,7 @@ static void vidconsole_escape_char(struct udevice *dev, char ch)
 			int row = priv->row_saved;
 			int col = priv->col_saved;
 
-			vidconsole_position_cursor(dev, col, row);
+			set_cursor_position(priv, row, col);
 			priv->escape = 0;
 			return;
 		}
@@ -242,7 +254,7 @@ static void vidconsole_escape_char(struct udevice *dev, char ch)
 		if (row < 0)
 			row = 0;
 		/* Right and bottom overflows are handled in the callee. */
-		vidconsole_position_cursor(dev, col, row);
+		set_cursor_position(priv, row, col);
 		break;
 	}
 	case 'H':
@@ -266,7 +278,7 @@ static void vidconsole_escape_char(struct udevice *dev, char ch)
 		if (col)
 			--col;
 
-		vidconsole_position_cursor(dev, col, row);
+		set_cursor_position(priv, row, col);
 
 		break;
 	}
@@ -655,3 +667,15 @@ int vidconsole_clear_and_reset(struct udevice *dev)
 
 	return 0;
 }
+
+void vidconsole_position_cursor(struct udevice *dev, unsigned col, unsigned row)
+{
+	struct vidconsole_priv *priv = dev_get_uclass_priv(dev);
+	struct udevice *vid_dev = dev->parent;
+	struct video_priv *vid_priv = dev_get_uclass_priv(vid_dev);
+	short x, y;
+
+	x = min_t(short, col * priv->x_charsize, vid_priv->xsize - 1);
+	y = min_t(short, row * priv->y_charsize, vid_priv->ysize - 1);
+	vidconsole_set_cursor_pos(dev, x, y);
+}
Signature · 1 line
2.34.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 12 lines · Tom Rini

This reverts commit 9f62a472dfb26ec14408a27938ddd2a25700009d.

The changes here aren't quite right, and on platforms such as Raspberry Pi where we can have both serial and video output, the change above causes output to change. This can be seen as the hush tests we have now fail.

---
Cc: Simon Glass <[email protected]>

Quoted 7 lines

Some other issues in my lab meant I thought I had tested this platform when I took the PR in originally, but hadn't. So I'd like to grab this ASAP.

---
 drivers/video/vidconsole-uclass.c | 44 ++++++++++++++++++++++++-------
 1 file changed, 34 insertions(+), 10 deletions(-)

I'll give it another go

author
#2 lore raw
Quoted 21 lines · Simon Glass
Quoted 12 lines · Tom Rini

This reverts commit 9f62a472dfb26ec14408a27938ddd2a25700009d.

The changes here aren't quite right, and on platforms such as Raspberry Pi where we can have both serial and video output, the change above causes output to change. This can be seen as the hush tests we have now fail.

---
Cc: Simon Glass <[email protected]>

Quoted 7 lines

Some other issues in my lab meant I thought I had tested this platform when I took the PR in originally, but hadn't. So I'd like to grab this ASAP.

---
 drivers/video/vidconsole-uclass.c | 44 ++++++++++++++++++++++++-------
 1 file changed, 34 insertions(+), 10 deletions(-)
Quoted 1 line

Applied to u-boot/next, thanks!

Signature · 1 line
Tom
#3 lore raw
In reply to Tom Rini

Hi Tom,

Quoted 7 lines · Tom Rini

This reverts commit 9f62a472dfb26ec14408a27938ddd2a25700009d.

The changes here aren't quite right, and on platforms such as Raspberry Pi where we can have both serial and video output, the change above causes output to change. This can be seen as the hush tests we have now fail.

I took at look at sorting this out. I gave it a crack with:

CROSS_COMPILE=/home/sglass/.buildman-toolchains/gcc-7.3.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi- ./test/py/test.py --bd rpi_3_32b --build-dir /tmp/b/rpi3 --build --id
sjg-rpi_3b -k hush
================ 67 passed, 1 skipped, 322 deselected in 13.02s ================

Do you know which rpi and which test?

Regards,
Simon
[..]

author
#4 lore raw
Quoted 11 lines · Simon Glass

Hi Tom,

Quoted 7 lines · Tom Rini

This reverts commit 9f62a472dfb26ec14408a27938ddd2a25700009d.

The changes here aren't quite right, and on platforms such as Raspberry Pi where we can have both serial and video output, the change above causes output to change. This can be seen as the hush tests we have now fail.

Quoted 8 lines

I took at look at sorting this out. I gave it a crack with:

CROSS_COMPILE=/home/sglass/.buildman-toolchains/gcc-7.3.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi- ./test/py/test.py --bd rpi_3_32b --build-dir /tmp/b/rpi3 --build --id
sjg-rpi_3b -k hush
================ 67 passed, 1 skipped, 322 deselected in 13.02s ================

Do you know which rpi and which test?

It was the if one about spaces, did you have video hooked up as well as serial?

Signature · 1 line
Tom