drm: selftest: convert drm_dp_mst_helper selftest to KUnit

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

Co-developed-by: Rubens Gomes Neto <rubens.gomes.neto@usp.br>
Signed-off-by: Rubens Gomes Neto <rubens.gomes.neto@usp.br>
Tested-by: David Gow <davidgow@google.com>
Acked-by: Daniel Latypov <dlatypov@google.com>
Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
Signed-off-by: Maíra Canal <maira.canal@usp.br>
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220708203052.236290-7-maira.canal@usp.br

diff --git a/drivers/gpu/drm/selftests/Makefile b/drivers/gpu/drm/selftests/Makefile
index 9e0ccb4..1539f55 100644 (file)
--- a/drivers/gpu/drm/selftests/Makefile
+++ b/drivers/gpu/drm/selftests/Makefile
@@ -1,6 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-only
-test-drm_modeset-y := test-drm_modeset_common.o test-drm_framebuffer.o \
-                                       test-drm_dp_mst_helper.o
+test-drm_modeset-y := test-drm_modeset_common.o test-drm_framebuffer.o
 
 obj-$(CONFIG_DRM_DEBUG_SELFTEST) += test-drm_mm.o test-drm_modeset.o \
                                    test-drm_buddy.o

diff --git a/drivers/gpu/drm/selftests/drm_modeset_selftests.h b/drivers/gpu/drm/selftests/drm_modeset_selftests.h
index 22e467f..40a29b8 100644 (file)
--- a/drivers/gpu/drm/selftests/drm_modeset_selftests.h
+++ b/drivers/gpu/drm/selftests/drm_modeset_selftests.h
@@ -7,5 +7,3 @@
  * Tests are executed in order by igt/drm_selftests_helper
  */
 selftest(check_drm_framebuffer_create, igt_check_drm_framebuffer_create)
-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_modeset_common.h b/drivers/gpu/drm/selftests/test-drm_modeset_common.h
index 790f3cf..3feb2fe 100644 (file)
--- a/drivers/gpu/drm/selftests/test-drm_modeset_common.h
+++ b/drivers/gpu/drm/selftests/test-drm_modeset_common.h
@@ -17,7 +17,5 @@
 #define FAIL_ON(x) FAIL((x), "%s", "FAIL_ON(" __stringify(x) ")\n")
 
 int igt_check_drm_framebuffer_create(void *ignored);
-int igt_dp_mst_calc_pbn_mode(void *ignored);
-int igt_dp_mst_sideband_msg_req_decode(void *ignored);
 
 #endif

diff --git a/drivers/gpu/drm/tests/Makefile b/drivers/gpu/drm/tests/Makefile
index 4d44006..5ffacd3 100644 (file)
--- a/drivers/gpu/drm/tests/Makefile
+++ b/drivers/gpu/drm/tests/Makefile
@@ -1,4 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0
 
 obj-$(CONFIG_DRM_KUNIT_TEST) += drm_format_helper_test.o drm_damage_helper_test.o \
-       drm_cmdline_parser_test.o drm_rect_test.o drm_format_test.o drm_plane_helper_test.o
+       drm_cmdline_parser_test.o drm_rect_test.o drm_format_test.o drm_plane_helper_test.o \
+       drm_dp_mst_helper_test.o

diff --git a/drivers/gpu/drm/selftests/test-drm_dp_mst_helper.c b/drivers/gpu/drm/tests/drm_dp_mst_helper_test.c
similarity index 72%
rename from drivers/gpu/drm/selftests/test-drm_dp_mst_helper.c
rename to drivers/gpu/drm/tests/drm_dp_mst_helper_test.c
index 4caa9be..1d2fade 100644 (file)
--- a/drivers/gpu/drm/selftests/test-drm_dp_mst_helper.c
+++ b/drivers/gpu/drm/tests/drm_dp_mst_helper_test.c
@@ -1,19 +1,22 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
  * Test cases for the DRM DP MST helpers
+ *
+ * Copyright (c) 2022 Maíra Canal <mairacanal@riseup.net>
  */
 
 #define PREFIX_STR "[drm_dp_mst_helper]"
 
+#include <kunit/test.h>
+
 #include <linux/random.h>
 
 #include <drm/display/drm_dp_mst_helper.h>
 #include <drm/drm_print.h>
 
 #include "../display/drm_dp_mst_topology_internal.h"
-#include "test-drm_modeset_common.h"
 
-int igt_dp_mst_calc_pbn_mode(void *ignored)
+static void igt_dp_mst_calc_pbn_mode(struct kunit *test)
 {
        int pbn, i;
        const struct {
@@ -33,13 +36,11 @@ int igt_dp_mst_calc_pbn_mode(void *ignored)
                pbn = drm_dp_calc_pbn_mode(test_params[i].rate,
                                           test_params[i].bpp,
                                           test_params[i].dsc);
-               FAIL(pbn != test_params[i].expected,
-                    "Expected PBN %d for clock %d bpp %d, got %d\n",
+               KUNIT_EXPECT_EQ_MSG(test, pbn, test_params[i].expected,
+                                   "Expected PBN %d for clock %d bpp %d, got %d\n",
                     test_params[i].expected, test_params[i].rate,
                     test_params[i].bpp, pbn);
        }
-
-       return 0;
 }
 
 static bool
@@ -176,66 +177,64 @@ out:
        return result;
 }
 
-int igt_dp_mst_sideband_msg_req_decode(void *unused)
+static void igt_dp_mst_sideband_msg_req_decode(struct kunit *test)
 {
        struct drm_dp_sideband_msg_req_body in = { 0 };
        u8 data[] = { 0xff, 0x0, 0xdd };
        int i;
 
-#define DO_TEST() FAIL_ON(!sideband_msg_req_encode_decode(&in))
-
        in.req_type = DP_ENUM_PATH_RESOURCES;
        in.u.port_num.port_number = 5;
-       DO_TEST();
+       KUNIT_EXPECT_TRUE(test, sideband_msg_req_encode_decode(&in));
 
        in.req_type = DP_POWER_UP_PHY;
        in.u.port_num.port_number = 5;
-       DO_TEST();
+       KUNIT_EXPECT_TRUE(test, sideband_msg_req_encode_decode(&in));
 
        in.req_type = DP_POWER_DOWN_PHY;
        in.u.port_num.port_number = 5;
-       DO_TEST();
+       KUNIT_EXPECT_TRUE(test, sideband_msg_req_encode_decode(&in));
 
        in.req_type = DP_ALLOCATE_PAYLOAD;
        in.u.allocate_payload.number_sdp_streams = 3;
        for (i = 0; i < in.u.allocate_payload.number_sdp_streams; i++)
                in.u.allocate_payload.sdp_stream_sink[i] = i + 1;
-       DO_TEST();
+       KUNIT_EXPECT_TRUE(test, sideband_msg_req_encode_decode(&in));
        in.u.allocate_payload.port_number = 0xf;
-       DO_TEST();
+       KUNIT_EXPECT_TRUE(test, sideband_msg_req_encode_decode(&in));
        in.u.allocate_payload.vcpi = 0x7f;
-       DO_TEST();
+       KUNIT_EXPECT_TRUE(test, sideband_msg_req_encode_decode(&in));
        in.u.allocate_payload.pbn = U16_MAX;
-       DO_TEST();
+       KUNIT_EXPECT_TRUE(test, sideband_msg_req_encode_decode(&in));
 
        in.req_type = DP_QUERY_PAYLOAD;
        in.u.query_payload.port_number = 0xf;
-       DO_TEST();
+       KUNIT_EXPECT_TRUE(test, sideband_msg_req_encode_decode(&in));
        in.u.query_payload.vcpi = 0x7f;
-       DO_TEST();
+       KUNIT_EXPECT_TRUE(test, sideband_msg_req_encode_decode(&in));
 
        in.req_type = DP_REMOTE_DPCD_READ;
        in.u.dpcd_read.port_number = 0xf;
-       DO_TEST();
+       KUNIT_EXPECT_TRUE(test, sideband_msg_req_encode_decode(&in));
        in.u.dpcd_read.dpcd_address = 0xfedcb;
-       DO_TEST();
+       KUNIT_EXPECT_TRUE(test, sideband_msg_req_encode_decode(&in));
        in.u.dpcd_read.num_bytes = U8_MAX;
-       DO_TEST();
+       KUNIT_EXPECT_TRUE(test, sideband_msg_req_encode_decode(&in));
 
        in.req_type = DP_REMOTE_DPCD_WRITE;
        in.u.dpcd_write.port_number = 0xf;
-       DO_TEST();
+       KUNIT_EXPECT_TRUE(test, sideband_msg_req_encode_decode(&in));
        in.u.dpcd_write.dpcd_address = 0xfedcb;
-       DO_TEST();
+       KUNIT_EXPECT_TRUE(test, sideband_msg_req_encode_decode(&in));
        in.u.dpcd_write.num_bytes = ARRAY_SIZE(data);
        in.u.dpcd_write.bytes = data;
-       DO_TEST();
+       KUNIT_EXPECT_TRUE(test, sideband_msg_req_encode_decode(&in));
 
        in.req_type = DP_REMOTE_I2C_READ;
        in.u.i2c_read.port_number = 0xf;
-       DO_TEST();
+       KUNIT_EXPECT_TRUE(test, sideband_msg_req_encode_decode(&in));
        in.u.i2c_read.read_i2c_device_id = 0x7f;
-       DO_TEST();
+       KUNIT_EXPECT_TRUE(test, sideband_msg_req_encode_decode(&in));
        in.u.i2c_read.num_transactions = 3;
        in.u.i2c_read.num_bytes_read = ARRAY_SIZE(data) * 3;
        for (i = 0; i < in.u.i2c_read.num_transactions; i++) {
@@ -244,32 +243,44 @@ int igt_dp_mst_sideband_msg_req_decode(void *unused)
                in.u.i2c_read.transactions[i].i2c_dev_id = 0x7f & ~i;
                in.u.i2c_read.transactions[i].i2c_transaction_delay = 0xf & ~i;
        }
-       DO_TEST();
+       KUNIT_EXPECT_TRUE(test, sideband_msg_req_encode_decode(&in));
 
        in.req_type = DP_REMOTE_I2C_WRITE;
        in.u.i2c_write.port_number = 0xf;
-       DO_TEST();
+       KUNIT_EXPECT_TRUE(test, sideband_msg_req_encode_decode(&in));
        in.u.i2c_write.write_i2c_device_id = 0x7f;
-       DO_TEST();
+       KUNIT_EXPECT_TRUE(test, sideband_msg_req_encode_decode(&in));
        in.u.i2c_write.num_bytes = ARRAY_SIZE(data);
        in.u.i2c_write.bytes = data;
-       DO_TEST();
+       KUNIT_EXPECT_TRUE(test, sideband_msg_req_encode_decode(&in));
 
        in.req_type = DP_QUERY_STREAM_ENC_STATUS;
        in.u.enc_status.stream_id = 1;
-       DO_TEST();
+       KUNIT_EXPECT_TRUE(test, sideband_msg_req_encode_decode(&in));
        get_random_bytes(in.u.enc_status.client_id,
                         sizeof(in.u.enc_status.client_id));
-       DO_TEST();
+       KUNIT_EXPECT_TRUE(test, sideband_msg_req_encode_decode(&in));
        in.u.enc_status.stream_event = 3;
-       DO_TEST();
+       KUNIT_EXPECT_TRUE(test, sideband_msg_req_encode_decode(&in));
        in.u.enc_status.valid_stream_event = 0;
-       DO_TEST();
+       KUNIT_EXPECT_TRUE(test, sideband_msg_req_encode_decode(&in));
        in.u.enc_status.stream_behavior = 3;
-       DO_TEST();
+       KUNIT_EXPECT_TRUE(test, sideband_msg_req_encode_decode(&in));
        in.u.enc_status.valid_stream_behavior = 1;
-       DO_TEST();
-
-#undef DO_TEST
-       return 0;
+       KUNIT_EXPECT_TRUE(test, sideband_msg_req_encode_decode(&in));
 }
+
+static struct kunit_case drm_dp_mst_helper_tests[] = {
+       KUNIT_CASE(igt_dp_mst_calc_pbn_mode),
+       KUNIT_CASE(igt_dp_mst_sideband_msg_req_decode),
+       { }
+};
+
+static struct kunit_suite drm_dp_mst_helper_test_suite = {
+       .name = "drm_dp_mst_helper",
+       .test_cases = drm_dp_mst_helper_tests,
+};
+
+kunit_test_suite(drm_dp_mst_helper_test_suite);
+
+MODULE_LICENSE("GPL");