diff options
-rw-r--r-- | lib/igt_kms.c | 6 | ||||
-rw-r--r-- | tests/kms_invalid_dotclock.c | 1 | ||||
-rw-r--r-- | tests/kms_pipe_crc_basic.c | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/lib/igt_kms.c b/lib/igt_kms.c index e5f42a6b..684a599c 100644 --- a/lib/igt_kms.c +++ b/lib/igt_kms.c @@ -2035,7 +2035,11 @@ void igt_display_require(igt_display_t *display, int drm_fd) out: LOG_UNINDENT(display); - igt_require(display->n_pipes && display->n_outputs); + if (display->n_pipes && display->n_outputs) + igt_enable_connectors(drm_fd); + else + igt_skip("No KMS driver or no outputs, pipes: %d, outputs: %d\n", + display->n_pipes, display->n_outputs); } /** diff --git a/tests/kms_invalid_dotclock.c b/tests/kms_invalid_dotclock.c index 8c4c3122..275007df 100644 --- a/tests/kms_invalid_dotclock.c +++ b/tests/kms_invalid_dotclock.c @@ -131,7 +131,6 @@ igt_simple_main data.drm_fd = drm_open_driver_master(DRIVER_INTEL); igt_require_intel(data.drm_fd); - igt_enable_connectors(data.drm_fd); kmstest_set_vt_graphics_mode(); igt_display_require(&data.display, data.drm_fd); diff --git a/tests/kms_pipe_crc_basic.c b/tests/kms_pipe_crc_basic.c index 5bc0952f..60802848 100644 --- a/tests/kms_pipe_crc_basic.c +++ b/tests/kms_pipe_crc_basic.c @@ -181,8 +181,6 @@ igt_main igt_fixture { data.drm_fd = drm_open_driver_master(DRIVER_ANY); - igt_enable_connectors(data.drm_fd); - kmstest_set_vt_graphics_mode(); igt_require_pipe_crc(data.drm_fd); |