From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: IGT development <igt-dev@lists.freedesktop.org>
Cc: Daniel Vetter <daniel.vetter@intel.com>
Subject: [igt-dev] [PATCH RESEND] lib/kms: Enable outputs by default in igt_require_display
Date: Fri, 7 Dec 2018 15:01:07 +0100 [thread overview]
Message-ID: <20181207140107.25360-1-daniel.vetter@ffwll.ch> (raw)
More testing, automatically when using the high-level kms helpers!
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
lib/igt_kms.c | 6 +++++-
tests/kms_invalid_dotclock.c | 1 -
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 e5f42a6bbcbb..684a599ca674 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 8c4c3122bec1..275007df942d 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 5bc0952fca3d..60802848d3ee 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);
--
2.20.0.rc1
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
next reply other threads:[~2018-12-07 14:01 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-07 14:01 Daniel Vetter [this message]
2018-12-07 14:21 ` [igt-dev] [PATCH RESEND] lib/kms: Enable outputs by default in igt_require_display Maarten Lankhorst
2018-12-07 15:00 ` Daniel Vetter
2018-12-07 15:14 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
2018-12-07 22:15 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181207140107.25360-1-daniel.vetter@ffwll.ch \
--to=daniel.vetter@ffwll.ch \
--cc=daniel.vetter@intel.com \
--cc=igt-dev@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox