[PATCH i-g-t 2/2] tests/kms_cursor_edge_walk: check for display and pipe CRC before cursor size

[Jakub Kolakowski]

Currently igt_require_pipe_crc(), igt_display_require() and
igt_display_require_output() is called after trying to get cursor
width and height which leads to fails on configurations that do
not have display enabled.
Move igt_require_pipe_crc(), igt_display_require() and
igt_display_require_output() before getting cursor width and
height so instead test will skip on configurations without
display.

Signed-off-by: Jakub Kolakowski <jakub1.kolakowski at intel.com>
---
 tests/kms_cursor_edge_walk.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/kms_cursor_edge_walk.c b/tests/kms_cursor_edge_walk.c
index 858d1da9b..27bee4482 100644
--- a/tests/kms_cursor_edge_walk.c
+++ b/tests/kms_cursor_edge_walk.c
@@ -361,6 +361,11 @@ igt_main_args("", long_opts, help_str, opt_handler, &data)
 
 		data.drm_fd = drm_open_driver_master(DRIVER_ANY);
 
+		igt_require_pipe_crc(data.drm_fd);
+
+		igt_display_require(&data.display, data.drm_fd);
+		igt_display_require_output(&data.display);
+
 		if (is_intel_device(data.drm_fd))
 			data.devid = intel_get_drm_devid(data.drm_fd);
 
@@ -372,11 +377,6 @@ igt_main_args("", long_opts, help_str, opt_handler, &data)
 
 		kmstest_set_vt_graphics_mode();
 
-		igt_require_pipe_crc(data.drm_fd);
-
-		igt_display_require(&data.display, data.drm_fd);
-		igt_display_require_output(&data.display);
-
 		/* Get active pipes. */
 		last_pipe = 0;
 		for_each_pipe(&data.display, pipe)
-- 
2.34.1