video: test: Split copy frame buffer check into a function

While checking frame buffer contents, the video tests also check if the
copy frame buffer contents match the main frame buffer. To test if only
the modified regions are updated after a sync, we will need to create
situations where the two are mismatched. Split this check into another
function that we can skip calling, since we won't want it to error on
those mismatched cases.

Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Link: https://lore.kernel.org/u-boot/20230821135111.3558478-2-alpernebiyasak@gmail.com/

diff --git a/test/dm/video.c b/test/dm/video.c
index e347c14..01fa9e1 100644 (file)
--- a/test/dm/video.c
+++ b/test/dm/video.c
@@ -54,9 +54,6 @@ DM_TEST(dm_test_video_base, UTF_SCAN_PDATA | UTF_SCAN_FDT);
  * size of the compressed data. This provides a pretty good level of
  * certainty and the resulting tests need only check a single value.
  *
- * If the copy framebuffer is enabled, this compares it to the main framebuffer
- * too.
- *
  * @uts:       Test state
  * @dev:       Video device
  * Return: compressed size of the frame buffer, or -ve on error
@@ -65,7 +62,6 @@ static int compress_frame_buffer(struct unit_test_state *uts,
                                 struct udevice *dev)
 {
        struct video_priv *priv = dev_get_uclass_priv(dev);
-       struct video_priv *uc_priv = dev_get_uclass_priv(dev);
        uint destlen;
        void *dest;
        int ret;
@@ -81,16 +77,34 @@ static int compress_frame_buffer(struct unit_test_state *uts,
        if (ret)
                return ret;
 
-       /* Check here that the copy frame buffer is working correctly */
-       if (IS_ENABLED(CONFIG_VIDEO_COPY)) {
-               ut_assertf(!memcmp(uc_priv->fb, uc_priv->copy_fb,
-                                  uc_priv->fb_size),
-                                  "Copy framebuffer does not match fb");
-       }
-
        return destlen;
 }
 
+/**
+ * check_copy_frame_buffer() - Compare main frame buffer to copy
+ *
+ * If the copy frame buffer is enabled, this compares it to the main
+ * frame buffer. Normally they should have the same contents after a
+ * sync.
+ *
+ * @uts:       Test state
+ * @dev:       Video device
+ * Return: 0, or -ve on error
+ */
+static int check_copy_frame_buffer(struct unit_test_state *uts,
+                                  struct udevice *dev)
+{
+       struct video_priv *priv = dev_get_uclass_priv(dev);
+
+       if (!IS_ENABLED(CONFIG_VIDEO_COPY))
+               return 0;
+
+       ut_assertf(!memcmp(priv->fb, priv->copy_fb, priv->fb_size),
+                  "Copy framebuffer does not match fb");
+
+       return 0;
+}
+
 /*
  * Call this function at any point to halt and show the current display. Be
  * sure to run the test with the -l flag.
@@ -154,24 +168,30 @@ static int dm_test_video_text(struct unit_test_state *uts)
        ut_assertok(uclass_get_device(UCLASS_VIDEO_CONSOLE, 0, &con));
        ut_assertok(vidconsole_select_font(con, "8x16", 0));
        ut_asserteq(46, compress_frame_buffer(uts, dev));
+       ut_assertok(check_copy_frame_buffer(uts, dev));
 
        ut_assertok(uclass_get_device(UCLASS_VIDEO_CONSOLE, 0, &con));
        vidconsole_putc_xy(con, 0, 0, 'a');
        ut_asserteq(79, compress_frame_buffer(uts, dev));
+       ut_assertok(check_copy_frame_buffer(uts, dev));
 
        vidconsole_putc_xy(con, 0, 0, ' ');
        ut_asserteq(46, compress_frame_buffer(uts, dev));
+       ut_assertok(check_copy_frame_buffer(uts, dev));
 
        for (i = 0; i < 20; i++)
                vidconsole_putc_xy(con, VID_TO_POS(i * 8), 0, ' ' + i);
        ut_asserteq(273, compress_frame_buffer(uts, dev));
+       ut_assertok(check_copy_frame_buffer(uts, dev));
 
        vidconsole_set_row(con, 0, WHITE);
        ut_asserteq(46, compress_frame_buffer(uts, dev));
+       ut_assertok(check_copy_frame_buffer(uts, dev));
 
        for (i = 0; i < 20; i++)
                vidconsole_putc_xy(con, VID_TO_POS(i * 8), 0, ' ' + i);
        ut_asserteq(273, compress_frame_buffer(uts, dev));
+       ut_assertok(check_copy_frame_buffer(uts, dev));
 
        return 0;
 }
@@ -190,24 +210,30 @@ static int dm_test_video_text_12x22(struct unit_test_state *uts)
        ut_assertok(uclass_get_device(UCLASS_VIDEO_CONSOLE, 0, &con));
        ut_assertok(vidconsole_select_font(con, "12x22", 0));
        ut_asserteq(46, compress_frame_buffer(uts, dev));
+       ut_assertok(check_copy_frame_buffer(uts, dev));
 
        ut_assertok(uclass_get_device(UCLASS_VIDEO_CONSOLE, 0, &con));
        vidconsole_putc_xy(con, 0, 0, 'a');
        ut_asserteq(89, compress_frame_buffer(uts, dev));
+       ut_assertok(check_copy_frame_buffer(uts, dev));
 
        vidconsole_putc_xy(con, 0, 0, ' ');
        ut_asserteq(46, compress_frame_buffer(uts, dev));
+       ut_assertok(check_copy_frame_buffer(uts, dev));
 
        for (i = 0; i < 20; i++)
                vidconsole_putc_xy(con, VID_TO_POS(i * 8), 0, ' ' + i);
        ut_asserteq(363, compress_frame_buffer(uts, dev));
+       ut_assertok(check_copy_frame_buffer(uts, dev));
 
        vidconsole_set_row(con, 0, WHITE);
        ut_asserteq(46, compress_frame_buffer(uts, dev));
+       ut_assertok(check_copy_frame_buffer(uts, dev));
 
        for (i = 0; i < 20; i++)
                vidconsole_putc_xy(con, VID_TO_POS(i * 8), 0, ' ' + i);
        ut_asserteq(363, compress_frame_buffer(uts, dev));
+       ut_assertok(check_copy_frame_buffer(uts, dev));
 
        return 0;
 }
@@ -225,6 +251,7 @@ static int dm_test_video_chars(struct unit_test_state *uts)
        ut_assertok(vidconsole_select_font(con, "8x16", 0));
        vidconsole_put_string(con, test_string);
        ut_asserteq(466, compress_frame_buffer(uts, dev));
+       ut_assertok(check_copy_frame_buffer(uts, dev));
 
        return 0;
 }
@@ -246,19 +273,23 @@ static int dm_test_video_ansi(struct unit_test_state *uts)
        video_clear(con->parent);
        video_sync(con->parent, false);
        ut_asserteq(46, compress_frame_buffer(uts, dev));
+       ut_assertok(check_copy_frame_buffer(uts, dev));
 
        /* test clear escape sequence: [2J */
        vidconsole_put_string(con, "A\tB\tC"ANSI_ESC"[2J");
        ut_asserteq(46, compress_frame_buffer(uts, dev));
+       ut_assertok(check_copy_frame_buffer(uts, dev));
 
        /* test set-cursor: [%d;%df */
        vidconsole_put_string(con, "abc"ANSI_ESC"[2;2fab"ANSI_ESC"[4;4fcd");
        ut_asserteq(143, compress_frame_buffer(uts, dev));
+       ut_assertok(check_copy_frame_buffer(uts, dev));
 
        /* test colors (30-37 fg color, 40-47 bg color) */
        vidconsole_put_string(con, ANSI_ESC"[30;41mfoo"); /* black on red */
        vidconsole_put_string(con, ANSI_ESC"[33;44mbar"); /* yellow on blue */
        ut_asserteq(272, compress_frame_buffer(uts, dev));
+       ut_assertok(check_copy_frame_buffer(uts, dev));
 
        return 0;
 }
@@ -291,11 +322,13 @@ static int check_vidconsole_output(struct unit_test_state *uts, int rot,
        ut_assertok(uclass_get_device(UCLASS_VIDEO_CONSOLE, 0, &con));
        ut_assertok(vidconsole_select_font(con, "8x16", 0));
        ut_asserteq(46, compress_frame_buffer(uts, dev));
+       ut_assertok(check_copy_frame_buffer(uts, dev));
 
        /* Check display wrap */
        for (i = 0; i < 120; i++)
                vidconsole_put_char(con, 'A' + i % 50);
        ut_asserteq(wrap_size, compress_frame_buffer(uts, dev));
+       ut_assertok(check_copy_frame_buffer(uts, dev));
 
        /* Check display scrolling */
        for (i = 0; i < SCROLL_LINES; i++) {
@@ -303,11 +336,13 @@ static int check_vidconsole_output(struct unit_test_state *uts, int rot,
                vidconsole_put_char(con, '\n');
        }
        ut_asserteq(scroll_size, compress_frame_buffer(uts, dev));
+       ut_assertok(check_copy_frame_buffer(uts, dev));
 
        /* If we scroll enough, the screen becomes blank again */
        for (i = 0; i < SCROLL_LINES; i++)
                vidconsole_put_char(con, '\n');
        ut_asserteq(46, compress_frame_buffer(uts, dev));
+       ut_assertok(check_copy_frame_buffer(uts, dev));
 
        return 0;
 }
@@ -382,6 +417,7 @@ static int dm_test_video_bmp(struct unit_test_state *uts)
 
        ut_assertok(video_bmp_display(dev, addr, 0, 0, false));
        ut_asserteq(1368, compress_frame_buffer(uts, dev));
+       ut_assertok(check_copy_frame_buffer(uts, dev));
 
        return 0;
 }
@@ -401,6 +437,7 @@ static int dm_test_video_bmp8(struct unit_test_state *uts)
 
        ut_assertok(video_bmp_display(dev, addr, 0, 0, false));
        ut_asserteq(1247, compress_frame_buffer(uts, dev));
+       ut_assertok(check_copy_frame_buffer(uts, dev));
 
        return 0;
 }
@@ -424,6 +461,7 @@ static int dm_test_video_bmp16(struct unit_test_state *uts)
 
        ut_assertok(video_bmp_display(dev, dst, 0, 0, false));
        ut_asserteq(3700, compress_frame_buffer(uts, dev));
+       ut_assertok(check_copy_frame_buffer(uts, dev));
 
        return 0;
 }
@@ -447,6 +485,7 @@ static int dm_test_video_bmp24(struct unit_test_state *uts)
 
        ut_assertok(video_bmp_display(dev, dst, 0, 0, false));
        ut_asserteq(3656, compress_frame_buffer(uts, dev));
+       ut_assertok(check_copy_frame_buffer(uts, dev));
 
        return 0;
 }
@@ -470,6 +509,7 @@ static int dm_test_video_bmp24_32(struct unit_test_state *uts)
 
        ut_assertok(video_bmp_display(dev, dst, 0, 0, false));
        ut_asserteq(6827, compress_frame_buffer(uts, dev));
+       ut_assertok(check_copy_frame_buffer(uts, dev));
 
        return 0;
 }
@@ -488,6 +528,7 @@ static int dm_test_video_bmp32(struct unit_test_state *uts)
 
        ut_assertok(video_bmp_display(dev, addr, 0, 0, false));
        ut_asserteq(2024, compress_frame_buffer(uts, dev));
+       ut_assertok(check_copy_frame_buffer(uts, dev));
 
        return 0;
 }
@@ -504,6 +545,7 @@ static int dm_test_video_bmp_comp(struct unit_test_state *uts)
 
        ut_assertok(video_bmp_display(dev, addr, 0, 0, false));
        ut_asserteq(1368, compress_frame_buffer(uts, dev));
+       ut_assertok(check_copy_frame_buffer(uts, dev));
 
        return 0;
 }
@@ -523,6 +565,7 @@ static int dm_test_video_comp_bmp32(struct unit_test_state *uts)
 
        ut_assertok(video_bmp_display(dev, addr, 0, 0, false));
        ut_asserteq(2024, compress_frame_buffer(uts, dev));
+       ut_assertok(check_copy_frame_buffer(uts, dev));
 
        return 0;
 }
@@ -542,6 +585,7 @@ static int dm_test_video_comp_bmp8(struct unit_test_state *uts)
 
        ut_assertok(video_bmp_display(dev, addr, 0, 0, false));
        ut_asserteq(1247, compress_frame_buffer(uts, dev));
+       ut_assertok(check_copy_frame_buffer(uts, dev));
 
        return 0;
 }
@@ -557,6 +601,7 @@ static int dm_test_video_truetype(struct unit_test_state *uts)
        ut_assertok(uclass_get_device(UCLASS_VIDEO_CONSOLE, 0, &con));
        vidconsole_put_string(con, test_string);
        ut_asserteq(12174, compress_frame_buffer(uts, dev));
+       ut_assertok(check_copy_frame_buffer(uts, dev));
 
        return 0;
 }
@@ -578,6 +623,7 @@ static int dm_test_video_truetype_scroll(struct unit_test_state *uts)
        ut_assertok(uclass_get_device(UCLASS_VIDEO_CONSOLE, 0, &con));
        vidconsole_put_string(con, test_string);
        ut_asserteq(34287, compress_frame_buffer(uts, dev));
+       ut_assertok(check_copy_frame_buffer(uts, dev));
 
        return 0;
 }
@@ -599,6 +645,7 @@ static int dm_test_video_truetype_bs(struct unit_test_state *uts)
        ut_assertok(uclass_get_device(UCLASS_VIDEO_CONSOLE, 0, &con));
        vidconsole_put_string(con, test_string);
        ut_asserteq(29471, compress_frame_buffer(uts, dev));
+       ut_assertok(check_copy_frame_buffer(uts, dev));
 
        return 0;
 }