diff options
| author | Alexandru Gheorghe <alexandru-cosmin.gheorghe@arm.com> | 2018-10-19 13:57:51 +0300 |
|---|---|---|
| committer | Alexandru Gheorghe <alexandru-cosmin.gheorghe@arm.com> | 2018-10-22 12:30:50 +0300 |
| commit | e51767279f11571b112dbeaef2628968c62f90a6 (patch) | |
| tree | bee1cb5e742d71c58bb08f47667df5f401cd9caa /drivers/gpu/drm/selftests | |
| parent | 9c71a6686bfa4bd8404d1bfa8f210b9901991fa9 (diff) | |
| download | linux-e51767279f11571b112dbeaef2628968c62f90a6.tar.xz | |
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 <alexandru-cosmin.gheorghe@arm.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20181019105752.17741-9-alexandru-cosmin.gheorghe@arm.com
Diffstat (limited to 'drivers/gpu/drm/selftests')
| -rw-r--r-- | drivers/gpu/drm/selftests/drm_modeset_selftests.h (renamed from drivers/gpu/drm/selftests/drm_plane_helper_selftests.h) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/selftests/test-drm_modeset_common.c | 11 | ||||
| -rw-r--r-- | drivers/gpu/drm/selftests/test-drm_modeset_common.h | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/selftests/test-drm_plane_helper.c | 19 |
4 files changed, 12 insertions, 20 deletions
diff --git a/drivers/gpu/drm/selftests/drm_plane_helper_selftests.h b/drivers/gpu/drm/selftests/drm_modeset_selftests.h index 9771290ed228..9771290ed228 100644 --- a/drivers/gpu/drm/selftests/drm_plane_helper_selftests.h +++ b/drivers/gpu/drm/selftests/drm_modeset_selftests.h 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; -} |