Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

+12 -20
drivers/gpu/drm/selftests/drm_plane_helper_selftests.h drivers/gpu/drm/selftests/drm_modeset_selftests.h
+10 -1
drivers/gpu/drm/selftests/test-drm_modeset_common.c
··· 7 7 8 8 #include "test-drm_modeset_common.h" 9 9 10 + #define TESTS "drm_modeset_selftests.h" 11 + #include "drm_selftest.h" 12 + 13 + #include "drm_selftest.c" 14 + 10 15 static int __init test_drm_modeset_init(void) 11 16 { 12 - return test_drm_plane_helper(); 17 + int err; 18 + 19 + err = run_selftests(selftests, ARRAY_SIZE(selftests), NULL); 20 + 21 + return err > 0 ? 0 : err; 13 22 } 14 23 15 24 static void __exit test_drm_modeset_exit(void)
+1 -1
drivers/gpu/drm/selftests/test-drm_modeset_common.h
··· 13 13 14 14 #define FAIL_ON(x) FAIL((x), "%s", "FAIL_ON(" __stringify(x) ")\n") 15 15 16 - int test_drm_plane_helper(void); 16 + int igt_check_plane_state(void *ignored); 17 17 18 18 #endif
+1 -18
drivers/gpu/drm/selftests/test-drm_plane_helper.c
··· 11 11 12 12 #include "test-drm_modeset_common.h" 13 13 14 - #define TESTS "drm_plane_helper_selftests.h" 15 - #include "drm_selftest.h" 16 - 17 14 static void set_src(struct drm_plane_state *plane_state, 18 15 unsigned src_x, unsigned src_y, 19 16 unsigned src_w, unsigned src_h) ··· 73 76 return true; 74 77 } 75 78 76 - static int igt_check_plane_state(void *ignored) 79 + int igt_check_plane_state(void *ignored) 77 80 { 78 81 int ret; 79 82 ··· 216 219 FAIL_ON(!check_crtc_eq(&plane_state, 0, 0, 1024, 768)); 217 220 218 221 return 0; 219 - } 220 - 221 - #include "drm_selftest.c" 222 - 223 - /** 224 - * test_drm_plane_helper - Run drm plane helper selftests. 225 - */ 226 - int test_drm_plane_helper(void) 227 - { 228 - int err; 229 - 230 - err = run_selftests(selftests, ARRAY_SIZE(selftests), NULL); 231 - 232 - return err > 0 ? 0 : err; 233 222 }