Re: [RFC PATCH 1/1] drm: selftest: convert drm_damage_helper selftest to KUnit

On Wed, Nov 10, 2021 at 4:35 PM André Almeida andrealmeid@collabora.com wrote:

From: Maíra Canal maira.canal@usp.br

Considering the current adoption of the KUnit framework, convert the DRM damage helper selftest to the KUnit API.

Overall, this looks promising.

I have 2 small suggestions below about the test assertions.

Another suggestion: should we add a drivers/gpu/drm/.kunitconfig file?

See https://www.kernel.org/doc/html/latest/dev-tools/kunit/running_tips.html#def... That gives the example of $ ./tools/testing/kunit/kunit.py run --kunitconfig=lib/kunit That works by picking up the lib/kunit/.kunitconfig file.

Adding one for this test would make it easier for others to run these tests, e.g. via

$ cat drivers/gpu/drm/.kunitconfig CONFIG_KUNIT=y CONFIG_DRM=y CONFIG_DRM_DAMAGE_HELPER_KUNIT_TEST=y

$ ./tools/testing/kunit/kunit.py run --kunitconfig=drivers/gpu/drm --arch=x86_64 ... Testing complete. 21 tests run. 0 failed. 0 crashed. 0 skipped.

Co-developed-by: Arthur Grillo arthur.grillo@usp.br Signed-off-by: Arthur Grillo arthur.grillo@usp.br Signed-off-by: Maíra Canal maira.canal@usp.br Signed-off-by: André Almeida andrealmeid@collabora.com

---

drivers/gpu/drm/Kconfig | 13 ++ drivers/gpu/drm/Makefile | 2 +- drivers/gpu/drm/selftests/Makefile | 5 +- .../gpu/drm/selftests/drm_modeset_selftests.h | 21 -- .../drm/selftests/test-drm_damage_helper.c | 215 +++++++++--------- 5 files changed, 127 insertions(+), 129 deletions(-)

diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index cea777ae7fb9..56f6ca74ebb6 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -79,6 +79,19 @@ config DRM_DEBUG_SELFTEST

      If in doubt, say "N".

+config DRM_DAMAGE_HELPER_KUNIT_TEST

•   tristate "KUnit tests for DRM damage helper"
  

•   depends on DRM && KUNIT
  

•   select DRM_KMS_HELPER
  

•   default KUNIT_ALL_TESTS
  

•   help
  

•     This option provides a KUnit module that can be used to run
  

•     an unit test on the DRM damage helper API. This option is not
  

•     useful for distributions or general kernels, but only for kernel
  

•     developers working on DRM and associated drivers.
  

•     If in doubt, say "N".
  

config DRM_KMS_HELPER tristate depends on DRM diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index ad1112154898..e632c43c9b7d 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -58,7 +58,7 @@ drm_kms_helper-$(CONFIG_DRM_DP_AUX_CHARDEV) += drm_dp_aux_dev.o drm_kms_helper-$(CONFIG_DRM_DP_CEC) += drm_dp_cec.o

obj-$(CONFIG_DRM_KMS_HELPER) += drm_kms_helper.o -obj-$(CONFIG_DRM_DEBUG_SELFTEST) += selftests/ +obj-y += selftests/

obj-$(CONFIG_DRM) += drm.o obj-$(CONFIG_DRM_MIPI_DBI) += drm_mipi_dbi.o diff --git a/drivers/gpu/drm/selftests/Makefile b/drivers/gpu/drm/selftests/Makefile index 0856e4b12f70..311f6af2caf1 100644 --- a/drivers/gpu/drm/selftests/Makefile +++ b/drivers/gpu/drm/selftests/Makefile @@ -1,7 +1,8 @@ # SPDX-License-Identifier: GPL-2.0-only test-drm_modeset-y := test-drm_modeset_common.o test-drm_plane_helper.o \ test-drm_format.o test-drm_framebuffer.o \

•                 test-drm_damage_helper.o test-drm_dp_mst_helper.o \
  

•                 test-drm_rect.o
  

•                 test-drm_dp_mst_helper.o test-drm_rect.o
  
  

obj-$(CONFIG_DRM_DEBUG_SELFTEST) += test-drm_mm.o test-drm_modeset.o test-drm_cmdline_parser.o

+obj-$(CONFIG_DRM_DAMAGE_HELPER_KUNIT_TEST) += test-drm_damage_helper.o diff --git a/drivers/gpu/drm/selftests/drm_modeset_selftests.h b/drivers/gpu/drm/selftests/drm_modeset_selftests.h index 782e285ca383..4787b3b70709 100644 --- a/drivers/gpu/drm/selftests/drm_modeset_selftests.h +++ b/drivers/gpu/drm/selftests/drm_modeset_selftests.h @@ -15,26 +15,5 @@ selftest(check_drm_format_block_width, igt_check_drm_format_block_width) selftest(check_drm_format_block_height, igt_check_drm_format_block_height) selftest(check_drm_format_min_pitch, igt_check_drm_format_min_pitch) selftest(check_drm_framebuffer_create, igt_check_drm_framebuffer_create) -selftest(damage_iter_no_damage, igt_damage_iter_no_damage) -selftest(damage_iter_no_damage_fractional_src, igt_damage_iter_no_damage_fractional_src) -selftest(damage_iter_no_damage_src_moved, igt_damage_iter_no_damage_src_moved) -selftest(damage_iter_no_damage_fractional_src_moved, igt_damage_iter_no_damage_fractional_src_moved) -selftest(damage_iter_no_damage_not_visible, igt_damage_iter_no_damage_not_visible) -selftest(damage_iter_no_damage_no_crtc, igt_damage_iter_no_damage_no_crtc) -selftest(damage_iter_no_damage_no_fb, igt_damage_iter_no_damage_no_fb) -selftest(damage_iter_simple_damage, igt_damage_iter_simple_damage) -selftest(damage_iter_single_damage, igt_damage_iter_single_damage) -selftest(damage_iter_single_damage_intersect_src, igt_damage_iter_single_damage_intersect_src) -selftest(damage_iter_single_damage_outside_src, igt_damage_iter_single_damage_outside_src) -selftest(damage_iter_single_damage_fractional_src, igt_damage_iter_single_damage_fractional_src) -selftest(damage_iter_single_damage_intersect_fractional_src, igt_damage_iter_single_damage_intersect_fractional_src) -selftest(damage_iter_single_damage_outside_fractional_src, igt_damage_iter_single_damage_outside_fractional_src) -selftest(damage_iter_single_damage_src_moved, igt_damage_iter_single_damage_src_moved) -selftest(damage_iter_single_damage_fractional_src_moved, igt_damage_iter_single_damage_fractional_src_moved) -selftest(damage_iter_damage, igt_damage_iter_damage) -selftest(damage_iter_damage_one_intersect, igt_damage_iter_damage_one_intersect) -selftest(damage_iter_damage_one_outside, igt_damage_iter_damage_one_outside) -selftest(damage_iter_damage_src_moved, igt_damage_iter_damage_src_moved) -selftest(damage_iter_damage_not_visible, igt_damage_iter_damage_not_visible) selftest(dp_mst_calc_pbn_mode, igt_dp_mst_calc_pbn_mode) selftest(dp_mst_sideband_msg_req_decode, igt_dp_mst_sideband_msg_req_decode) diff --git a/drivers/gpu/drm/selftests/test-drm_damage_helper.c b/drivers/gpu/drm/selftests/test-drm_damage_helper.c index 1c19a5d3eefb..83905661d41e 100644 --- a/drivers/gpu/drm/selftests/test-drm_damage_helper.c +++ b/drivers/gpu/drm/selftests/test-drm_damage_helper.c @@ -3,14 +3,11 @@

• Test case for drm_damage_helper functions

*/

-#define pr_fmt(fmt) "drm_damage_helper: " fmt

+#include <kunit/test.h> #include <drm/drm_damage_helper.h> #include <drm/drm_plane.h> #include <drm/drm_drv.h>

-#include "test-drm_modeset_common.h"

struct drm_driver mock_driver; static struct drm_device mock_device; static struct drm_object_properties mock_obj_props; @@ -114,7 +111,7 @@ const struct drm_framebuffer fb = { mock_setup(&old_state); \ mock_setup(&state);

-int igt_damage_iter_no_damage(void *ignored) +static void igt_damage_iter_no_damage(struct kunit *test) { struct drm_atomic_helper_damage_iter iter; struct drm_rect clip; @@ -129,13 +126,12 @@ int igt_damage_iter_no_damage(void *ignored) drm_atomic_for_each_plane_damage(&iter, &clip) num_hits++;

•   FAIL(num_hits != 1, "Should return plane src as damage.");
  

•   FAIL_ON(!check_damage_clip(&state, &clip, 0, 0, 2048, 2048));
  

•   return 0;
  

•   KUNIT_EXPECT_EQ(test, num_hits, 1);
  

optional: KUNIT_EXPECT_EQ_MSG(test, num_hits, 1, "Should return...")

can be used to make the error message more similar to the original.

The same applies to the other instances below

•   KUNIT_EXPECT_TRUE(test,
  

•                   check_damage_clip(&state, &clip, 0, 0, 2048, 2048));
  

optional:

check_damage_clip(test, &state, &clip, 0, 0, 2048, 2048);

and then change check_damage_clip like so:

static void check_damage_clip(struct kunit *test, struct drm_plane_state *state, struct drm_rect *r, int x1, int y1, int x2, int y2) { /* * Round down x1/y1 and round up x2/y2. This is because damage is not in * 16.16 fixed point so to catch all pixels. */ int src_x1 = state->src.x1 >> 16; int src_y1 = state->src.y1 >> 16; int src_x2 = (state->src.x2 >> 16) + !!(state->src.x2 & 0xFFFF); int src_y2 = (state->src.y2 >> 16) + !!(state->src.y2 & 0xFFFF);

if (x1 >= x2 || y1 >= y2) { KUNIT_FAIL(test, "Cannot have damage clip with no dimension."); } else if (x1 < src_x1 || y1 < src_y1 || x2 > src_x2 || y2 > src_y2) { KUNIT_FAIL(test, "Damage cannot be outside rounded plane src."); } else if (r->x1 != x1 || r->y1 != y1 || r->x2 != x2 || r->y2 != y2) { KUNIT_FAIL(test, "Damage = %d %d %d %d", r->x1, r->y1, r->x2, r->y2); }

I'd actually recommend enhancing the original error messages a bit, e.g.: KUNIT_FAIL(test, "Damage = %d %d %d %d, want = %d %d %d %d", r->x1, r->y1, r->x2, r->y2, x1, y1, x2, y2)

Then if I deliberately mess up one of the calls to this func, I get:

[18:08:02] # igt_damage_iter_no_damage_src_moved: EXPECTATION FAILED at drivers/gpu/drm/selftests/test-drm_damage_helper.c:87 [18:08:02] Damage = 10 10 1034 778, want = 11 10 1034 778 [18:08:02] not ok 3 - igt_damage_iter_no_damage_src_moved

} }

}

-int igt_damage_iter_no_damage_fractional_src(void *ignored) +static void igt_damage_iter_no_damage_fractional_src(struct kunit *test) { struct drm_atomic_helper_damage_iter iter; struct drm_rect clip; @@ -152,13 +148,12 @@ int igt_damage_iter_no_damage_fractional_src(void *ignored) drm_atomic_for_each_plane_damage(&iter, &clip) num_hits++;

•   FAIL(num_hits != 1, "Should return rounded off plane src as damage.");
  

•   FAIL_ON(!check_damage_clip(&state, &clip, 3, 3, 1028, 772));
  

•   return 0;
  

•   KUNIT_EXPECT_EQ(test, num_hits, 1);
  

•   KUNIT_EXPECT_TRUE(test,
  

•                   check_damage_clip(&state, &clip, 3, 3, 1028, 772));
  

}

-int igt_damage_iter_no_damage_src_moved(void *ignored) +static void igt_damage_iter_no_damage_src_moved(struct kunit *test) { struct drm_atomic_helper_damage_iter iter; struct drm_rect clip; @@ -174,13 +169,12 @@ int igt_damage_iter_no_damage_src_moved(void *ignored) drm_atomic_for_each_plane_damage(&iter, &clip) num_hits++;

•   FAIL(num_hits != 1, "Should return plane src as damage.");
  

•   FAIL_ON(!check_damage_clip(&state, &clip, 10, 10, 1034, 778));
  

•   return 0;
  

•   KUNIT_EXPECT_EQ(test, num_hits, 1);
  

•   KUNIT_EXPECT_TRUE(test,
  

•                   check_damage_clip(&state, &clip, 10, 10, 1034, 778));
  

}

-int igt_damage_iter_no_damage_fractional_src_moved(void *ignored) +static void igt_damage_iter_no_damage_fractional_src_moved(struct kunit *test) { struct drm_atomic_helper_damage_iter iter; struct drm_rect clip; @@ -197,13 +191,11 @@ int igt_damage_iter_no_damage_fractional_src_moved(void *ignored) drm_atomic_for_each_plane_damage(&iter, &clip) num_hits++;

•   FAIL(num_hits != 1, "Should return plane src as damage.");
  

•   FAIL_ON(!check_damage_clip(&state, &clip, 4, 4, 1029, 773));
  

•   return 0;
  

•   KUNIT_EXPECT_EQ(test, num_hits, 1);
  

•   KUNIT_EXPECT_TRUE(test, check_damage_clip(&state, &clip, 4, 4, 1029, 773));
  

}

-int igt_damage_iter_no_damage_not_visible(void *ignored) +static void igt_damage_iter_no_damage_not_visible(struct kunit *test) { struct drm_atomic_helper_damage_iter iter; struct drm_rect clip; @@ -221,12 +213,10 @@ int igt_damage_iter_no_damage_not_visible(void *ignored) drm_atomic_for_each_plane_damage(&iter, &clip) num_hits++;

•   FAIL(num_hits != 0, "Should have no damage.");
  

•   return 0;
  

•   KUNIT_EXPECT_EQ(test, num_hits, 0);
  

}

-int igt_damage_iter_no_damage_no_crtc(void *ignored) +static void igt_damage_iter_no_damage_no_crtc(struct kunit *test) { struct drm_atomic_helper_damage_iter iter; struct drm_rect clip; @@ -242,12 +232,10 @@ int igt_damage_iter_no_damage_no_crtc(void *ignored) drm_atomic_for_each_plane_damage(&iter, &clip) num_hits++;

•   FAIL(num_hits != 0, "Should have no damage.");
  

•   return 0;
  

•   KUNIT_EXPECT_EQ(test, num_hits, 0);
  

}

-int igt_damage_iter_no_damage_no_fb(void *ignored) +static void igt_damage_iter_no_damage_no_fb(struct kunit *test) { struct drm_atomic_helper_damage_iter iter; struct drm_plane_state old_state; @@ -267,12 +255,10 @@ int igt_damage_iter_no_damage_no_fb(void *ignored) drm_atomic_for_each_plane_damage(&iter, &clip) num_hits++;

•   FAIL(num_hits != 0, "Should have no damage.");
  

•   return 0;
  

•   KUNIT_EXPECT_EQ(test, num_hits, 0);
  

}

-int igt_damage_iter_simple_damage(void *ignored) +static void igt_damage_iter_simple_damage(struct kunit *test) { struct drm_atomic_helper_damage_iter iter; struct drm_property_blob damage_blob; @@ -292,13 +278,11 @@ int igt_damage_iter_simple_damage(void *ignored) drm_atomic_for_each_plane_damage(&iter, &clip) num_hits++;

•   FAIL(num_hits != 1, "Should return damage when set.");
  

•   FAIL_ON(!check_damage_clip(&state, &clip, 0, 0, 1024, 768));
  

•   return 0;
  

•   KUNIT_EXPECT_EQ(test, num_hits, 1);
  

•   KUNIT_EXPECT_TRUE(test, check_damage_clip(&state, &clip, 0, 0, 1024, 768));
  

}

-int igt_damage_iter_single_damage(void *ignored) +static void igt_damage_iter_single_damage(struct kunit *test) { struct drm_atomic_helper_damage_iter iter; struct drm_property_blob damage_blob; @@ -317,13 +301,12 @@ int igt_damage_iter_single_damage(void *ignored) drm_atomic_for_each_plane_damage(&iter, &clip) num_hits++;

•   FAIL(num_hits != 1, "Should return damage when set.");
  

•   FAIL_ON(!check_damage_clip(&state, &clip, 256, 192, 768, 576));
  

•   return 0;
  

•   KUNIT_EXPECT_EQ(test, num_hits, 1);
  

•   KUNIT_EXPECT_TRUE(test,
  

•                   check_damage_clip(&state, &clip, 256, 192, 768, 576));
  

}

-int igt_damage_iter_single_damage_intersect_src(void *ignored) +static void igt_damage_iter_single_damage_intersect_src(struct kunit *test) { struct drm_atomic_helper_damage_iter iter; struct drm_property_blob damage_blob; @@ -343,13 +326,12 @@ int igt_damage_iter_single_damage_intersect_src(void *ignored) drm_atomic_for_each_plane_damage(&iter, &clip) num_hits++;

•   FAIL(num_hits != 1, "Should return damage clipped to src.");
  

•   FAIL_ON(!check_damage_clip(&state, &clip, 256, 192, 1024, 768));
  

•   return 0;
  

•   KUNIT_EXPECT_EQ(test, num_hits, 1);
  

•   KUNIT_EXPECT_TRUE(test,
  

•                   check_damage_clip(&state, &clip, 256, 192, 1024, 768));
  

}

-int igt_damage_iter_single_damage_outside_src(void *ignored) +static void igt_damage_iter_single_damage_outside_src(struct kunit *test) { struct drm_atomic_helper_damage_iter iter; struct drm_property_blob damage_blob; @@ -369,12 +351,10 @@ int igt_damage_iter_single_damage_outside_src(void *ignored) drm_atomic_for_each_plane_damage(&iter, &clip) num_hits++;

•   FAIL(num_hits != 0, "Should have no damage.");
  

•   return 0;
  

•   KUNIT_EXPECT_EQ(test, num_hits, 0);
  

}

-int igt_damage_iter_single_damage_fractional_src(void *ignored) +static void igt_damage_iter_single_damage_fractional_src(struct kunit *test) { struct drm_atomic_helper_damage_iter iter; struct drm_property_blob damage_blob; @@ -396,13 +376,13 @@ int igt_damage_iter_single_damage_fractional_src(void *ignored) drm_atomic_for_each_plane_damage(&iter, &clip) num_hits++;

•   FAIL(num_hits != 1, "Should return damage when set.");
  

•   FAIL_ON(!check_damage_clip(&state, &clip, 10, 10, 256, 330));
  

•   return 0;
  

•   KUNIT_EXPECT_EQ(test, num_hits, 1);
  

•   KUNIT_EXPECT_TRUE(test,
  

•                   check_damage_clip(&state, &clip, 10, 10, 256, 330));
  

}

-int igt_damage_iter_single_damage_intersect_fractional_src(void *ignored) +static void igt_damage_iter_single_damage_intersect_fractional_src(

•           struct kunit *test)
  

{ struct drm_atomic_helper_damage_iter iter; struct drm_property_blob damage_blob; @@ -425,13 +405,13 @@ int igt_damage_iter_single_damage_intersect_fractional_src(void *ignored) drm_atomic_for_each_plane_damage(&iter, &clip) num_hits++;

•   FAIL(num_hits != 1, "Should return damage clipped to rounded off src.");
  

•   FAIL_ON(!check_damage_clip(&state, &clip, 10, 4, 1029, 330));
  

•   return 0;
  

•   KUNIT_EXPECT_EQ(test, num_hits, 1);
  

•   KUNIT_EXPECT_TRUE(test,
  

•                   check_damage_clip(&state, &clip, 10, 4, 1029, 330));
  

}

-int igt_damage_iter_single_damage_outside_fractional_src(void *ignored) +static void igt_damage_iter_single_damage_outside_fractional_src(

•           struct kunit *test)
  

{ struct drm_atomic_helper_damage_iter iter; struct drm_property_blob damage_blob; @@ -454,12 +434,10 @@ int igt_damage_iter_single_damage_outside_fractional_src(void *ignored) drm_atomic_for_each_plane_damage(&iter, &clip) num_hits++;

•   FAIL(num_hits != 0, "Should have no damage.");
  

•   return 0;
  

•   KUNIT_EXPECT_EQ(test, num_hits, 0);
  

}

-int igt_damage_iter_single_damage_src_moved(void *ignored) +static void igt_damage_iter_single_damage_src_moved(struct kunit *test) { struct drm_atomic_helper_damage_iter iter; struct drm_property_blob damage_blob; @@ -480,13 +458,13 @@ int igt_damage_iter_single_damage_src_moved(void *ignored) drm_atomic_for_each_plane_damage(&iter, &clip) num_hits++;

•   FAIL(num_hits != 1, "Should return plane src as damage.");
  

•   FAIL_ON(!check_damage_clip(&state, &clip, 10, 10, 1034, 778));
  

•   return 0;
  

•   KUNIT_EXPECT_EQ(test, num_hits, 1);
  

•   KUNIT_EXPECT_TRUE(test,
  

•                   check_damage_clip(&state, &clip, 10, 10, 1034, 778));
  

}

-int igt_damage_iter_single_damage_fractional_src_moved(void *ignored) +static void igt_damage_iter_single_damage_fractional_src_moved(

•           struct kunit *test)
  

{ struct drm_atomic_helper_damage_iter iter; struct drm_property_blob damage_blob; @@ -509,13 +487,11 @@ int igt_damage_iter_single_damage_fractional_src_moved(void *ignored) drm_atomic_for_each_plane_damage(&iter, &clip) num_hits++;

•   FAIL(num_hits != 1, "Should return rounded off plane src as damage.");
  

•   FAIL_ON(!check_damage_clip(&state, &clip, 4, 4, 1029, 773));
  

•   return 0;
  

•   KUNIT_EXPECT_EQ(test, num_hits, 1);
  

•   KUNIT_EXPECT_TRUE(test, check_damage_clip(&state, &clip, 4, 4, 1029, 773));
  

}

-int igt_damage_iter_damage(void *ignored) +static void igt_damage_iter_damage(struct kunit *test) { struct drm_atomic_helper_damage_iter iter; struct drm_property_blob damage_blob; @@ -535,18 +511,18 @@ int igt_damage_iter_damage(void *ignored) drm_atomic_helper_damage_iter_init(&iter, &old_state, &state); drm_atomic_for_each_plane_damage(&iter, &clip) { if (num_hits == 0)

•                   FAIL_ON(!check_damage_clip(&state, &clip, 20, 30, 200, 180));
  

•                   KUNIT_EXPECT_TRUE(test,
  

•                                   check_damage_clip(&state, &clip, 20, 30, 200, 180));
            if (num_hits == 1)
  

•                   FAIL_ON(!check_damage_clip(&state, &clip, 240, 200, 280, 250));
  

•                   KUNIT_EXPECT_TRUE(test,
  

•                                   check_damage_clip(&state, &clip, 240, 200, 280, 250));
            num_hits++;
    }
  
  

•   FAIL(num_hits != 2, "Should return damage when set.");
  

•   return 0;
  

•   KUNIT_EXPECT_EQ(test, num_hits, 2);
  

}

-int igt_damage_iter_damage_one_intersect(void *ignored) +static void igt_damage_iter_damage_one_intersect(struct kunit *test) { struct drm_atomic_helper_damage_iter iter; struct drm_property_blob damage_blob; @@ -568,18 +544,18 @@ int igt_damage_iter_damage_one_intersect(void *ignored) drm_atomic_helper_damage_iter_init(&iter, &old_state, &state); drm_atomic_for_each_plane_damage(&iter, &clip) { if (num_hits == 0)

•                   FAIL_ON(!check_damage_clip(&state, &clip, 20, 30, 200, 180));
  

•                   KUNIT_EXPECT_TRUE(test,
  

•                                   check_damage_clip(&state, &clip, 20, 30, 200, 180));
            if (num_hits == 1)
  

•                   FAIL_ON(!check_damage_clip(&state, &clip, 4, 4, 1029, 773));
  

•                   KUNIT_EXPECT_TRUE(test,
  

•                                   check_damage_clip(&state, &clip, 4, 4, 1029, 773));
            num_hits++;
    }
  
  

•   FAIL(num_hits != 2, "Should return damage when set.");
  

•   return 0;
  

•   KUNIT_EXPECT_EQ(test, num_hits, 2);
  

}

-int igt_damage_iter_damage_one_outside(void *ignored) +static void igt_damage_iter_damage_one_outside(struct kunit *test) { struct drm_atomic_helper_damage_iter iter; struct drm_property_blob damage_blob; @@ -600,13 +576,12 @@ int igt_damage_iter_damage_one_outside(void *ignored) drm_atomic_for_each_plane_damage(&iter, &clip) num_hits++;

•   FAIL(num_hits != 1, "Should return damage when set.");
  

•   FAIL_ON(!check_damage_clip(&state, &clip, 240, 200, 280, 250));
  

•   return 0;
  

•   KUNIT_EXPECT_EQ(test, num_hits, 1);
  

•   KUNIT_EXPECT_TRUE(test,
  

•                   check_damage_clip(&state, &clip, 240, 200, 280, 250));
  

}

-int igt_damage_iter_damage_src_moved(void *ignored) +static void igt_damage_iter_damage_src_moved(struct kunit *test) { struct drm_atomic_helper_damage_iter iter; struct drm_property_blob damage_blob; @@ -629,13 +604,11 @@ int igt_damage_iter_damage_src_moved(void *ignored) drm_atomic_for_each_plane_damage(&iter, &clip) num_hits++;

•   FAIL(num_hits != 1, "Should return round off plane src as damage.");
  

•   FAIL_ON(!check_damage_clip(&state, &clip, 3, 3, 1028, 772));
  

•   return 0;
  

•   KUNIT_EXPECT_EQ(test, num_hits, 1);
  

•   KUNIT_EXPECT_TRUE(test, check_damage_clip(&state, &clip, 3, 3, 1028, 772));
  

}

-int igt_damage_iter_damage_not_visible(void *ignored) +static void igt_damage_iter_damage_not_visible(struct kunit *test) { struct drm_atomic_helper_damage_iter iter; struct drm_property_blob damage_blob; @@ -660,7 +633,39 @@ int igt_damage_iter_damage_not_visible(void *ignored) drm_atomic_for_each_plane_damage(&iter, &clip) num_hits++;

•   FAIL(num_hits != 0, "Should not return any damage.");
  

•   return 0;
  

•   KUNIT_EXPECT_EQ(test, num_hits, 0);
  

}

+static struct kunit_case drm_damage_helper_tests[] = {

•   KUNIT_CASE(igt_damage_iter_no_damage),
  

•   KUNIT_CASE(igt_damage_iter_no_damage_fractional_src),
  

•   KUNIT_CASE(igt_damage_iter_no_damage_src_moved),
  

•   KUNIT_CASE(igt_damage_iter_no_damage_fractional_src_moved),
  

•   KUNIT_CASE(igt_damage_iter_no_damage_not_visible),
  

•   KUNIT_CASE(igt_damage_iter_no_damage_no_crtc),
  

•   KUNIT_CASE(igt_damage_iter_no_damage_no_fb),
  

•   KUNIT_CASE(igt_damage_iter_simple_damage),
  

•   KUNIT_CASE(igt_damage_iter_single_damage),
  

•   KUNIT_CASE(igt_damage_iter_single_damage_intersect_src),
  

•   KUNIT_CASE(igt_damage_iter_single_damage_outside_src),
  

•   KUNIT_CASE(igt_damage_iter_single_damage_fractional_src),
  

•   KUNIT_CASE(igt_damage_iter_single_damage_intersect_fractional_src),
  

•   KUNIT_CASE(igt_damage_iter_single_damage_outside_fractional_src),
  

•   KUNIT_CASE(igt_damage_iter_single_damage_src_moved),
  

•   KUNIT_CASE(igt_damage_iter_single_damage_fractional_src_moved),
  

•   KUNIT_CASE(igt_damage_iter_damage),
  

•   KUNIT_CASE(igt_damage_iter_damage_one_intersect),
  

•   KUNIT_CASE(igt_damage_iter_damage_one_outside),
  

•   KUNIT_CASE(igt_damage_iter_damage_src_moved),
  

•   KUNIT_CASE(igt_damage_iter_damage_not_visible),
  

•   { }
  

+};

+static struct kunit_suite drm_damage_helper_test_suite = {

•   .name = "drm_damage_helper_tests",
  

•   .test_cases = drm_damage_helper_tests,
  

+};

+kunit_test_suite(drm_damage_helper_test_suite);

+MODULE_LICENSE("GPL");

2.33.1