tests/kms_cursor_crc: Add test to check extreme alpha values for cursor plane

Add test to check extreme alpha values i.e. fully opaque and fully transparent for cursor plane and verify by calculating hardware and software CRC.

Signed-off-by Mamta Shukla <[email protected]>

---
 tests/kms_cursor_crc.c | 77 ++++++++++++++++++++++++++++++++++++++----
 1 file changed, 70 insertions(+), 7 deletions(-)

tests/kms_cursor_crc.c +13 -6

index 1514e7f2..7f581ca0 100644
@@ -65,7 +65,7 @@ typedef struct {
 #define TEST_DPMS (1<<0)
 #define TEST_SUSPEND (1<<1)
 
-static void draw_cursor(cairo_t *cr, int x, int y, int cw, int ch)
+static void draw_cursor(cairo_t *cr, int x, int y, int cw, int ch, double a)
 {
 	int wl, wr, ht, hb;
 

@@ -80,10 +80,10 @@ static void draw_cursor(cairo_t *cr, int x, int y, int cw, int ch)
 		return;
 	cairo_set_antialias(cr, CAIRO_ANTIALIAS_NONE);
 	/* 4 color rectangles in the corners, RGBY */
-	igt_paint_color_alpha(cr, x,      y,      wl, ht, 1.0, 0.0, 0.0, 1.0);
-	igt_paint_color_alpha(cr, x + wl, y,      wr, ht, 0.0, 1.0, 0.0, 1.0);
-	igt_paint_color_alpha(cr, x,      y + ht, wl, hb, 0.0, 0.0, 1.0, 1.0);
-	igt_paint_color_alpha(cr, x + wl, y + ht, wr, hb, 0.5, 0.5, 0.5, 1.0);
+	igt_paint_color_alpha(cr, x,      y,      wl, ht, 1.0, 0.0, 0.0, a);
+	igt_paint_color_alpha(cr, x + wl, y,      wr, ht, 0.0, 1.0, 0.0, a);
+	igt_paint_color_alpha(cr, x,      y + ht, wl, hb, 0.0, 0.0, 1.0, a);
+	igt_paint_color_alpha(cr, x + wl, y + ht, wr, hb, 0.5, 0.5, 0.5, a);
 }
 
 static void cursor_enable(data_t *data)

@@ -200,7 +200,7 @@ static void do_single_test(data_t *data, int x, int y)
 
 	/* Now render the same in software and collect crc */
 	cr = igt_get_cairo_ctx(data->drm_fd, &data->primary_fb);
-	draw_cursor(cr, x, y, data->curw, data->curh);
+	draw_cursor(cr, x, y, data->curw, data->curh, 1.0);
 	igt_put_cairo_ctx(data->drm_fd, &data->primary_fb, cr);
 	igt_display_commit(display);
 

@@ -404,6 +404,61 @@ static void cleanup_crtc(data_t *data, igt_output_t *output)
 	igt_display_commit(display);
 }
 
+static void test_cursor_alpha(data_t *data, double a)
+{
+	igt_display_t *display = &data->display;
+	igt_pipe_crc_t *pipe_crc = data->pipe_crc;
+	igt_crc_t crc, ref_crc;
+	cairo_t *cr;
+	uint32_t fb_id;

tests/kms_cursor_crc.c +12 -0

+	igt_assert(fb_id);
+
+	cr = igt_get_cairo_ctx(data->drm_fd, &data->fb);
+	draw_cursor(cr, 0, 0, curw, curh, a);
+	igt_put_cairo_ctx(data->drm_fd, &data->fb, cr);
+
+	/*Hardware Test*/
+	cursor_enable(data);
+	igt_display_commit(display);
+	igt_wait_for_vblank(data->drm_fd, data->pipe);
+	igt_pipe_crc_collect_crc(pipe_crc, &crc);
+	cursor_disable(data);

tests/kms_cursor_crc.c +24 -1

+
+}
+
+static void test_cursor_transparent(data_t *data)
+{
+	test_cursor_alpha(data, 0.0);
+
+}
+
+static void test_cursor_opaque(data_t *data)
+{
+	test_cursor_alpha(data, 1.0);
+}
+
+
 static void run_test(data_t *data, void (*testfunc)(data_t *), int cursor_w, int cursor_h)
 {
 	igt_display_t *display = &data->display;

@@ -461,7 +516,7 @@ static void create_cursor_fb(data_t *data, int cur_w, int cur_h)
 	igt_assert(fb_id);
 
 	cr = igt_get_cairo_ctx(data->drm_fd, &data->fb);
-	draw_cursor(cr, 0, 0, cur_w, cur_h);
+	draw_cursor(cr, 0, 0, cur_w, cur_h, 1.0);
 	igt_put_cairo_ctx(data->drm_fd, &data->fb, cr);
 }
 

@@ -684,6 +739,14 @@ igt_main
 	igt_subtest_f("cursor-size-change")
 		run_test(&data, test_cursor_size, cursor_width, cursor_height);
 
+	igt_subtest_f("cursor-alpha-opaque") {
+		run_test(&data, test_cursor_opaque, cursor_width, cursor_height);
+	 }
+
+	igt_subtest_f("cursor-alpha-transparent") {
+		run_test(&data, test_cursor_transparent, cursor_width, cursor_height);
+	 }
+
 	run_test_generic(&data);
 
 	igt_fixture {

Signature · 1 line

2.17.1

Overall the functionality looks good, just some minor coding style nits below:

Quoted 56 lines · Mamta Shukla

Add test to check extreme alpha values i.e. fully opaque and fully transparent for cursor plane and verify by calculating hardware and software CRC.

Signed-off-by Mamta Shukla <[email protected]>

---
 tests/kms_cursor_crc.c | 77 ++++++++++++++++++++++++++++++++++++++----
 1 file changed, 70 insertions(+), 7 deletions(-)

tests/kms_cursor_crc.c +13 -6

index 1514e7f2..7f581ca0 100644
@@ -65,7 +65,7 @@ typedef struct {
 #define TEST_DPMS (1<<0)
 #define TEST_SUSPEND (1<<1)
 
-static void draw_cursor(cairo_t *cr, int x, int y, int cw, int ch)
+static void draw_cursor(cairo_t *cr, int x, int y, int cw, int ch, double a)
 {
      int wl, wr, ht, hb;
 

@@ -80,10 +80,10 @@ static void draw_cursor(cairo_t *cr, int x, int y, int cw, int ch)
              return;
      cairo_set_antialias(cr, CAIRO_ANTIALIAS_NONE);
      /* 4 color rectangles in the corners, RGBY */
-     igt_paint_color_alpha(cr, x,      y,      wl, ht, 1.0, 0.0, 0.0, 1.0);
-     igt_paint_color_alpha(cr, x + wl, y,      wr, ht, 0.0, 1.0, 0.0, 1.0);
-     igt_paint_color_alpha(cr, x,      y + ht, wl, hb, 0.0, 0.0, 1.0, 1.0);
-     igt_paint_color_alpha(cr, x + wl, y + ht, wr, hb, 0.5, 0.5, 0.5, 1.0);
+     igt_paint_color_alpha(cr, x,      y,      wl, ht, 1.0, 0.0, 0.0, a);
+     igt_paint_color_alpha(cr, x + wl, y,      wr, ht, 0.0, 1.0, 0.0, a);
+     igt_paint_color_alpha(cr, x,      y + ht, wl, hb, 0.0, 0.0, 1.0, a);
+     igt_paint_color_alpha(cr, x + wl, y + ht, wr, hb, 0.5, 0.5, 0.5, a);
 }
 
 static void cursor_enable(data_t *data)

@@ -200,7 +200,7 @@ static void do_single_test(data_t *data, int x, int y)
 
      /* Now render the same in software and collect crc */
      cr = igt_get_cairo_ctx(data->drm_fd, &data->primary_fb);
-     draw_cursor(cr, x, y, data->curw, data->curh);
+     draw_cursor(cr, x, y, data->curw, data->curh, 1.0);
      igt_put_cairo_ctx(data->drm_fd, &data->primary_fb, cr);
      igt_display_commit(display);
 

@@ -404,6 +404,61 @@ static void cleanup_crtc(data_t *data, igt_output_t *output)
      igt_display_commit(display);
 }
 
+static void test_cursor_alpha(data_t *data, double a)
+{
+     igt_display_t *display = &data->display;
+     igt_pipe_crc_t *pipe_crc = data->pipe_crc;
+     igt_crc_t crc, ref_crc;
+     cairo_t *cr;
+     uint32_t fb_id;

tests/kms_cursor_crc.c static void cleanup_crtc(data_t *data, igt_output_t *output) · line 423

Quoted 10 lines

tests/kms_cursor_crc.c +10 -0

+     int curw=data->curw;
+     int curh=data->curh;
+
+     /*alpha cursor fb*/
+     fb_id = igt_create_color_fb(data->drm_fd, curw, curh,
+                                 DRM_FORMAT_ARGB8888,
+                                 LOCAL_DRM_FORMAT_MOD_NONE,
+                                 1.0, 1.0, 1.0,
+                                 &data->fb);
+

Unnecessary new line

Quoted 17 lines

tests/kms_cursor_crc.c +17 -0

+     igt_assert(fb_id);
+
+     cr = igt_get_cairo_ctx(data->drm_fd, &data->fb);
+     draw_cursor(cr, 0, 0, curw, curh, a);
+     igt_put_cairo_ctx(data->drm_fd, &data->fb, cr);
+
+     /*Hardware Test*/
+     cursor_enable(data);
+     igt_display_commit(display);
+     igt_wait_for_vblank(data->drm_fd, data->pipe);
+     igt_pipe_crc_collect_crc(pipe_crc, &crc);
+     cursor_disable(data);
+
+     /*Software Test*/
+     cr = igt_get_cairo_ctx(data->drm_fd, &data->primary_fb);
+     igt_paint_color_alpha(cr, 0, 0, curw, curh, 1.0, 1.0, 1.0, a);
+     igt_put_cairo_ctx(data->drm_fd, &data->primary_fb, cr);

tests/kms_cursor_crc.c static void cleanup_crtc(data_t *data, igt_output_t *output) · line 445

Quoted 5 lines

tests/kms_cursor_crc.c +5 -0

+
+     igt_display_commit(display);
+     igt_wait_for_vblank(data->drm_fd, data->pipe);
+     igt_pipe_crc_collect_crc(pipe_crc, &ref_crc);
+     igt_assert_crc_equal(&crc, &ref_crc);

The other subtest test_cursor_size clears the screen at the end, may be you should consider doing that as well

tests/kms_cursor_crc.c static void cleanup_crtc(data_t *data, igt_output_t *output) · line 446

Quoted 1 line

tests/kms_cursor_crc.c +1 -0

+     igt_remove_fb(data->drm_fd, &data->fb);

I think the igt_remove_fb is probably not needed here since the run_test_generic calls this in igt_fixture at the end.
Please double check if you still need this call.

Apart from this everything else looks good to me.

Regards
Manasi

Quoted 41 lines

tests/kms_cursor_crc.c +24 -1

+
+}
+
+static void test_cursor_transparent(data_t *data)
+{
+     test_cursor_alpha(data, 0.0);
+
+}
+
+static void test_cursor_opaque(data_t *data)
+{
+     test_cursor_alpha(data, 1.0);
+}
+
+
 static void run_test(data_t *data, void (*testfunc)(data_t *), int cursor_w, int cursor_h)
 {
      igt_display_t *display = &data->display;

@@ -461,7 +516,7 @@ static void create_cursor_fb(data_t *data, int cur_w, int cur_h)
      igt_assert(fb_id);
 
      cr = igt_get_cairo_ctx(data->drm_fd, &data->fb);
-     draw_cursor(cr, 0, 0, cur_w, cur_h);
+     draw_cursor(cr, 0, 0, cur_w, cur_h, 1.0);
      igt_put_cairo_ctx(data->drm_fd, &data->fb, cr);
 }
 

@@ -684,6 +739,14 @@ igt_main
      igt_subtest_f("cursor-size-change")
              run_test(&data, test_cursor_size, cursor_width, cursor_height);
 
+     igt_subtest_f("cursor-alpha-opaque") {
+             run_test(&data, test_cursor_opaque, cursor_width, cursor_height);
+      }
+
+     igt_subtest_f("cursor-alpha-transparent") {
+             run_test(&data, test_cursor_transparent, cursor_width, cursor_height);
+      }
+
      run_test_generic(&data);
 

Quoted 4 lines

tests/kms_cursor_crc.c +0 -1

      igt_fixture {
--

2.17.1