diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2018-12-07 15:01:07 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2018-12-10 10:55:33 +0100 |
| commit | 4579ac1d445cf39f6de474071b20db790db575bd (patch) | |
| tree | 0363300c04fc6ded67f1a9f332b864cd608824ba | |
| parent | a260cab988aef89dfe24e0dcfd13345cce600108 (diff) | |
lib/kms: Enable outputs by default in igt_require_display
More testing, automatically when using the high-level kms helpers!
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
| -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); |