From e51767279f11571b112dbeaef2628968c62f90a6 Mon Sep 17 00:00:00 2001 From: Alexandru Gheorghe Date: Fri, 19 Oct 2018 11:57:51 +0100 Subject: drm/selftest: Refactor test-drm_plane_helper The idea is to split test implementations in different compilation units, but have one single place where we define the list of tests, in this case(drm_modeset_selftests.h). Signed-off-by: Alexandru Gheorghe Reviewed-by: Daniel Vetter Link: https://patchwork.freedesktop.org/patch/msgid/20181019105752.17741-9-alexandru-cosmin.gheorghe@arm.com --- drivers/gpu/drm/selftests/drm_modeset_selftests.h | 9 +++++++++ .../gpu/drm/selftests/drm_plane_helper_selftests.h | 9 --------- drivers/gpu/drm/selftests/test-drm_modeset_common.c | 11 ++++++++++- drivers/gpu/drm/selftests/test-drm_modeset_common.h | 2 +- drivers/gpu/drm/selftests/test-drm_plane_helper.c | 19 +------------------ 5 files changed, 21 insertions(+), 29 deletions(-) create mode 100644 drivers/gpu/drm/selftests/drm_modeset_selftests.h delete mode 100644 drivers/gpu/drm/selftests/drm_plane_helper_selftests.h (limited to 'drivers/gpu/drm/selftests') diff --git a/drivers/gpu/drm/selftests/drm_modeset_selftests.h b/drivers/gpu/drm/selftests/drm_modeset_selftests.h new file mode 100644 index 000000000000..9771290ed228 --- /dev/null +++ b/drivers/gpu/drm/selftests/drm_modeset_selftests.h @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* List each unit test as selftest(name, function) + * + * The name is used as both an enum and expanded as igt__name to create + * a module parameter. It must be unique and legal for a C identifier. + * + * Tests are executed in order by igt/drm_selftests_helper + */ +selftest(check_plane_state, igt_check_plane_state) diff --git a/drivers/gpu/drm/selftests/drm_plane_helper_selftests.h b/drivers/gpu/drm/selftests/drm_plane_helper_selftests.h deleted file mode 100644 index 9771290ed228..000000000000 --- a/drivers/gpu/drm/selftests/drm_plane_helper_selftests.h +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* List each unit test as selftest(name, function) - * - * The name is used as both an enum and expanded as igt__name to create - * a module parameter. It must be unique and legal for a C identifier. - * - * Tests are executed in order by igt/drm_selftests_helper - */ -selftest(check_plane_state, igt_check_plane_state) diff --git a/drivers/gpu/drm/selftests/test-drm_modeset_common.c b/drivers/gpu/drm/selftests/test-drm_modeset_common.c index fad5209043f1..2a7f93774006 100644 --- a/drivers/gpu/drm/selftests/test-drm_modeset_common.c +++ b/drivers/gpu/drm/selftests/test-drm_modeset_common.c @@ -7,9 +7,18 @@ #include "test-drm_modeset_common.h" +#define TESTS "drm_modeset_selftests.h" +#include "drm_selftest.h" + +#include "drm_selftest.c" + static int __init test_drm_modeset_init(void) { - return test_drm_plane_helper(); + int err; + + err = run_selftests(selftests, ARRAY_SIZE(selftests), NULL); + + return err > 0 ? 0 : err; } static void __exit test_drm_modeset_exit(void) diff --git a/drivers/gpu/drm/selftests/test-drm_modeset_common.h b/drivers/gpu/drm/selftests/test-drm_modeset_common.h index bdeba264661f..b0065a2eb067 100644 --- a/drivers/gpu/drm/selftests/test-drm_modeset_common.h +++ b/drivers/gpu/drm/selftests/test-drm_modeset_common.h @@ -13,6 +13,6 @@ #define FAIL_ON(x) FAIL((x), "%s", "FAIL_ON(" __stringify(x) ")\n") -int test_drm_plane_helper(void); +int igt_check_plane_state(void *ignored); #endif diff --git a/drivers/gpu/drm/selftests/test-drm_plane_helper.c b/drivers/gpu/drm/selftests/test-drm_plane_helper.c index 0dad2f812a27..0a9553f51796 100644 --- a/drivers/gpu/drm/selftests/test-drm_plane_helper.c +++ b/drivers/gpu/drm/selftests/test-drm_plane_helper.c @@ -11,9 +11,6 @@ #include "test-drm_modeset_common.h" -#define TESTS "drm_plane_helper_selftests.h" -#include "drm_selftest.h" - static void set_src(struct drm_plane_state *plane_state, unsigned src_x, unsigned src_y, unsigned src_w, unsigned src_h) @@ -76,7 +73,7 @@ static bool check_crtc_eq(struct drm_plane_state *plane_state, return true; } -static int igt_check_plane_state(void *ignored) +int igt_check_plane_state(void *ignored) { int ret; @@ -220,17 +217,3 @@ static int igt_check_plane_state(void *ignored) return 0; } - -#include "drm_selftest.c" - -/** - * test_drm_plane_helper - Run drm plane helper selftests. - */ -int test_drm_plane_helper(void) -{ - int err; - - err = run_selftests(selftests, ARRAY_SIZE(selftests), NULL); - - return err > 0 ? 0 : err; -} -- cgit