video: test: Support checking copy frame buffer contents

The video tests have a helper function to generate a pseudo-digest of
frame buffer contents, but it only does so for the main one. There is
another check that the copy frame buffer is the same as that. But
neither is enough to test if only the modified regions are copied to the
copy frame buffer, since we will want the two to be different in very
specific ways.

Add a boolean argument to the existing helper function to indicate which
frame buffer we want to inspect, and update the existing callers.

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-3-alpernebiyasak@gmail.com/

diff --git a/test/dm/video.c b/test/dm/video.c
index 01fa9e1..edb1b4e 100644 (file)
--- a/test/dm/video.c
+++ b/test/dm/video.c
@@ -56,22 +56,28 @@ DM_TEST(dm_test_video_base, UTF_SCAN_PDATA | UTF_SCAN_FDT);
  *
  * @uts:       Test state
  * @dev:       Video device
+ * @use_copy:  Use copy frame buffer if available
  * Return: compressed size of the frame buffer, or -ve on error
  */
 static int compress_frame_buffer(struct unit_test_state *uts,
-                                struct udevice *dev)
+                                struct udevice *dev,
+                                bool use_copy)
 {
        struct video_priv *priv = dev_get_uclass_priv(dev);
        uint destlen;
        void *dest;
        int ret;
 
+       if (!IS_ENABLED(CONFIG_VIDEO_COPY))
+               use_copy = false;
+
        destlen = priv->fb_size;
        dest = malloc(priv->fb_size);
        if (!dest)
                return -ENOMEM;
        ret = BZ2_bzBuffToBuffCompress(dest, &destlen,
-                                      priv->fb, priv->fb_size,
+                                      use_copy ? priv->copy_fb : priv->fb,
+                                      priv->fb_size,
                                       3, 0, 0);
        free(dest);
        if (ret)
@@ -167,30 +173,30 @@ static int dm_test_video_text(struct unit_test_state *uts)
        ut_assertok(video_get_nologo(uts, &dev));
        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_asserteq(46, compress_frame_buffer(uts, dev, false));
        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_asserteq(79, compress_frame_buffer(uts, dev, false));
        ut_assertok(check_copy_frame_buffer(uts, dev));
 
        vidconsole_putc_xy(con, 0, 0, ' ');
-       ut_asserteq(46, compress_frame_buffer(uts, dev));
+       ut_asserteq(46, compress_frame_buffer(uts, dev, false));
        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_asserteq(273, compress_frame_buffer(uts, dev, false));
        ut_assertok(check_copy_frame_buffer(uts, dev));
 
        vidconsole_set_row(con, 0, WHITE);
-       ut_asserteq(46, compress_frame_buffer(uts, dev));
+       ut_asserteq(46, compress_frame_buffer(uts, dev, false));
        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_asserteq(273, compress_frame_buffer(uts, dev, false));
        ut_assertok(check_copy_frame_buffer(uts, dev));
 
        return 0;
@@ -209,30 +215,30 @@ static int dm_test_video_text_12x22(struct unit_test_state *uts)
        ut_assertok(video_get_nologo(uts, &dev));
        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_asserteq(46, compress_frame_buffer(uts, dev, false));
        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_asserteq(89, compress_frame_buffer(uts, dev, false));
        ut_assertok(check_copy_frame_buffer(uts, dev));
 
        vidconsole_putc_xy(con, 0, 0, ' ');
-       ut_asserteq(46, compress_frame_buffer(uts, dev));
+       ut_asserteq(46, compress_frame_buffer(uts, dev, false));
        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_asserteq(363, compress_frame_buffer(uts, dev, false));
        ut_assertok(check_copy_frame_buffer(uts, dev));
 
        vidconsole_set_row(con, 0, WHITE);
-       ut_asserteq(46, compress_frame_buffer(uts, dev));
+       ut_asserteq(46, compress_frame_buffer(uts, dev, false));
        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_asserteq(363, compress_frame_buffer(uts, dev, false));
        ut_assertok(check_copy_frame_buffer(uts, dev));
 
        return 0;
@@ -250,7 +256,7 @@ static int dm_test_video_chars(struct unit_test_state *uts)
        ut_assertok(uclass_get_device(UCLASS_VIDEO_CONSOLE, 0, &con));
        ut_assertok(vidconsole_select_font(con, "8x16", 0));
        vidconsole_put_string(con, test_string);
-       ut_asserteq(466, compress_frame_buffer(uts, dev));
+       ut_asserteq(466, compress_frame_buffer(uts, dev, false));
        ut_assertok(check_copy_frame_buffer(uts, dev));
 
        return 0;
@@ -272,23 +278,23 @@ static int dm_test_video_ansi(struct unit_test_state *uts)
        /* reference clear: */
        video_clear(con->parent);
        video_sync(con->parent, false);
-       ut_asserteq(46, compress_frame_buffer(uts, dev));
+       ut_asserteq(46, compress_frame_buffer(uts, dev, false));
        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_asserteq(46, compress_frame_buffer(uts, dev, false));
        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_asserteq(143, compress_frame_buffer(uts, dev, false));
        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_asserteq(272, compress_frame_buffer(uts, dev, false));
        ut_assertok(check_copy_frame_buffer(uts, dev));
 
        return 0;
@@ -321,13 +327,13 @@ static int check_vidconsole_output(struct unit_test_state *uts, int rot,
        ut_assertok(video_get_nologo(uts, &dev));
        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_asserteq(46, compress_frame_buffer(uts, dev, false));
        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_asserteq(wrap_size, compress_frame_buffer(uts, dev, false));
        ut_assertok(check_copy_frame_buffer(uts, dev));
 
        /* Check display scrolling */
@@ -335,13 +341,13 @@ static int check_vidconsole_output(struct unit_test_state *uts, int rot,
                vidconsole_put_char(con, 'A' + i % 50);
                vidconsole_put_char(con, '\n');
        }
-       ut_asserteq(scroll_size, compress_frame_buffer(uts, dev));
+       ut_asserteq(scroll_size, compress_frame_buffer(uts, dev, false));
        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_asserteq(46, compress_frame_buffer(uts, dev, false));
        ut_assertok(check_copy_frame_buffer(uts, dev));
 
        return 0;
@@ -416,7 +422,7 @@ static int dm_test_video_bmp(struct unit_test_state *uts)
        ut_assertok(read_file(uts, "tools/logos/denx.bmp", &addr));
 
        ut_assertok(video_bmp_display(dev, addr, 0, 0, false));
-       ut_asserteq(1368, compress_frame_buffer(uts, dev));
+       ut_asserteq(1368, compress_frame_buffer(uts, dev, false));
        ut_assertok(check_copy_frame_buffer(uts, dev));
 
        return 0;
@@ -436,7 +442,7 @@ static int dm_test_video_bmp8(struct unit_test_state *uts)
        ut_assertok(read_file(uts, "tools/logos/denx.bmp", &addr));
 
        ut_assertok(video_bmp_display(dev, addr, 0, 0, false));
-       ut_asserteq(1247, compress_frame_buffer(uts, dev));
+       ut_asserteq(1247, compress_frame_buffer(uts, dev, false));
        ut_assertok(check_copy_frame_buffer(uts, dev));
 
        return 0;
@@ -460,7 +466,7 @@ static int dm_test_video_bmp16(struct unit_test_state *uts)
                           &src_len));
 
        ut_assertok(video_bmp_display(dev, dst, 0, 0, false));
-       ut_asserteq(3700, compress_frame_buffer(uts, dev));
+       ut_asserteq(3700, compress_frame_buffer(uts, dev, false));
        ut_assertok(check_copy_frame_buffer(uts, dev));
 
        return 0;
@@ -484,7 +490,7 @@ static int dm_test_video_bmp24(struct unit_test_state *uts)
                           &src_len));
 
        ut_assertok(video_bmp_display(dev, dst, 0, 0, false));
-       ut_asserteq(3656, compress_frame_buffer(uts, dev));
+       ut_asserteq(3656, compress_frame_buffer(uts, dev, false));
        ut_assertok(check_copy_frame_buffer(uts, dev));
 
        return 0;
@@ -508,7 +514,7 @@ static int dm_test_video_bmp24_32(struct unit_test_state *uts)
                           &src_len));
 
        ut_assertok(video_bmp_display(dev, dst, 0, 0, false));
-       ut_asserteq(6827, compress_frame_buffer(uts, dev));
+       ut_asserteq(6827, compress_frame_buffer(uts, dev, false));
        ut_assertok(check_copy_frame_buffer(uts, dev));
 
        return 0;
@@ -527,7 +533,7 @@ static int dm_test_video_bmp32(struct unit_test_state *uts)
        ut_assertok(read_file(uts, "tools/logos/denx.bmp", &addr));
 
        ut_assertok(video_bmp_display(dev, addr, 0, 0, false));
-       ut_asserteq(2024, compress_frame_buffer(uts, dev));
+       ut_asserteq(2024, compress_frame_buffer(uts, dev, false));
        ut_assertok(check_copy_frame_buffer(uts, dev));
 
        return 0;
@@ -544,7 +550,7 @@ static int dm_test_video_bmp_comp(struct unit_test_state *uts)
        ut_assertok(read_file(uts, "tools/logos/denx-comp.bmp", &addr));
 
        ut_assertok(video_bmp_display(dev, addr, 0, 0, false));
-       ut_asserteq(1368, compress_frame_buffer(uts, dev));
+       ut_asserteq(1368, compress_frame_buffer(uts, dev, false));
        ut_assertok(check_copy_frame_buffer(uts, dev));
 
        return 0;
@@ -564,7 +570,7 @@ static int dm_test_video_comp_bmp32(struct unit_test_state *uts)
        ut_assertok(read_file(uts, "tools/logos/denx.bmp", &addr));
 
        ut_assertok(video_bmp_display(dev, addr, 0, 0, false));
-       ut_asserteq(2024, compress_frame_buffer(uts, dev));
+       ut_asserteq(2024, compress_frame_buffer(uts, dev, false));
        ut_assertok(check_copy_frame_buffer(uts, dev));
 
        return 0;
@@ -584,7 +590,7 @@ static int dm_test_video_comp_bmp8(struct unit_test_state *uts)
        ut_assertok(read_file(uts, "tools/logos/denx.bmp", &addr));
 
        ut_assertok(video_bmp_display(dev, addr, 0, 0, false));
-       ut_asserteq(1247, compress_frame_buffer(uts, dev));
+       ut_asserteq(1247, compress_frame_buffer(uts, dev, false));
        ut_assertok(check_copy_frame_buffer(uts, dev));
 
        return 0;
@@ -600,7 +606,7 @@ static int dm_test_video_truetype(struct unit_test_state *uts)
        ut_assertok(video_get_nologo(uts, &dev));
        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_asserteq(12174, compress_frame_buffer(uts, dev, false));
        ut_assertok(check_copy_frame_buffer(uts, dev));
 
        return 0;
@@ -622,7 +628,7 @@ static int dm_test_video_truetype_scroll(struct unit_test_state *uts)
        ut_assertok(video_get_nologo(uts, &dev));
        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_asserteq(34287, compress_frame_buffer(uts, dev, false));
        ut_assertok(check_copy_frame_buffer(uts, dev));
 
        return 0;
@@ -644,7 +650,7 @@ static int dm_test_video_truetype_bs(struct unit_test_state *uts)
        ut_assertok(video_get_nologo(uts, &dev));
        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_asserteq(29471, compress_frame_buffer(uts, dev, false));
        ut_assertok(check_copy_frame_buffer(uts, dev));
 
        return 0;