From: Mohammed Khajapasha <mohammed.khajapasha@intel.com>
To: suresh.kumar.kurmi@intel.com, kishore.kunche@intel.com,
petri.latvala@intel.com, mohammed.khajapasha@intel.com,
arkadiusz.hiler@intel.com, igt-dev@lists.freedesktop.org
Subject: [igt-dev] [PATCH i-g-t 6/6] tests/kms: Skip kms test cases for disabled pipes
Date: Wed, 17 Jun 2020 23:22:54 +0530 [thread overview]
Message-ID: <20200617175254.17659-7-mohammed.khajapasha@intel.com> (raw)
In-Reply-To: <20200617175254.17659-1-mohammed.khajapasha@intel.com>
Skip the kms test cases for disabled pipes with
non-contiguous pipe display.
Signed-off-by: Mohammed Khajapasha <mohammed.khajapasha@intel.com>
---
tests/kms_color.c | 3 ++-
tests/kms_color_chamelium.c | 3 ++-
tests/kms_concurrent.c | 3 ++-
tests/kms_pipe_crc_basic.c | 6 ++++--
tests/kms_plane.c | 3 ++-
tests/kms_plane_lowres.c | 3 ++-
tests/kms_plane_multiple.c | 3 ++-
tests/kms_universal_plane.c | 18 ++++++++++++------
8 files changed, 28 insertions(+), 14 deletions(-)
diff --git a/tests/kms_color.c b/tests/kms_color.c
index 7f2fbd4a..19f0f9b5 100644
--- a/tests/kms_color.c
+++ b/tests/kms_color.c
@@ -628,7 +628,8 @@ run_tests_for_pipe(data_t *data, enum pipe p)
igt_fixture {
igt_require_pipe_crc(data->drm_fd);
- igt_require(p < data->display.n_pipes);
+ igt_require((p < data->display.n_pipes) &&
+ (data->display.pipes[p].enabled));
pipe = &data->display.pipes[p];
igt_require(pipe->n_planes >= 0);
diff --git a/tests/kms_color_chamelium.c b/tests/kms_color_chamelium.c
index 7f5a911c..2d690ca3 100644
--- a/tests/kms_color_chamelium.c
+++ b/tests/kms_color_chamelium.c
@@ -519,7 +519,8 @@ run_tests_for_pipe(data_t *data, enum pipe p)
igt_fixture {
- igt_require(p < data->display.n_pipes);
+ igt_require((p < data->display.n_pipes) &&
+ (data->display.pipes[p].enabled));
pipe = &data->display.pipes[p];
igt_require(pipe->n_planes >= 0);
diff --git a/tests/kms_concurrent.c b/tests/kms_concurrent.c
index 89016563..1730bb2b 100644
--- a/tests/kms_concurrent.c
+++ b/tests/kms_concurrent.c
@@ -320,7 +320,8 @@ run_tests_for_pipe(data_t *data, enum pipe pipe)
igt_fixture {
int valid_tests = 0;
- igt_skip_on(pipe >= data->display.n_pipes);
+ igt_skip_on((pipe >= data->display.n_pipes) ||
+ !(data->display.pipes[pipe].enabled));
igt_require(data->display.pipes[pipe].n_planes > 0);
for_each_valid_output_on_pipe(&data->display, pipe, output)
diff --git a/tests/kms_pipe_crc_basic.c b/tests/kms_pipe_crc_basic.c
index d169b7bd..ec31e2ca 100644
--- a/tests/kms_pipe_crc_basic.c
+++ b/tests/kms_pipe_crc_basic.c
@@ -71,7 +71,8 @@ static void test_read_crc(data_t *data, enum pipe pipe, unsigned flags)
igt_crc_t *crcs = NULL;
int c, j;
- igt_skip_on(pipe >= data->display.n_pipes);
+ igt_skip_on((pipe >= display->n_pipes) ||
+ !(display->pipes[pipe].enabled));
igt_require_f(output, "No connector found for pipe %s\n",
kmstest_pipe_name(pipe));
@@ -187,7 +188,8 @@ igt_main
test_read_crc(&data, pipe, TEST_SEQUENCE | TEST_NONBLOCK);
igt_subtest_f("suspend-read-crc-pipe-%s", kmstest_pipe_name(pipe)) {
- igt_skip_on(pipe >= data.display.n_pipes);
+ igt_skip_on((pipe >= data.display.n_pipes) ||
+ !(data.display.pipes[pipe].enabled));
test_read_crc(&data, pipe, 0);
diff --git a/tests/kms_plane.c b/tests/kms_plane.c
index c6ead813..85ed4f94 100644
--- a/tests/kms_plane.c
+++ b/tests/kms_plane.c
@@ -940,7 +940,8 @@ static void
run_tests_for_pipe_plane(data_t *data, enum pipe pipe)
{
igt_fixture {
- igt_skip_on(pipe >= data->display.n_pipes);
+ igt_skip_on((pipe >= data->display.n_pipes) ||
+ !(data->display.pipes[pipe].enabled));
igt_require(data->display.pipes[pipe].n_planes > 0);
}
diff --git a/tests/kms_plane_lowres.c b/tests/kms_plane_lowres.c
index 012b25e3..16afe570 100644
--- a/tests/kms_plane_lowres.c
+++ b/tests/kms_plane_lowres.c
@@ -259,7 +259,8 @@ test_planes_on_pipe(data_t *data, uint64_t modifier)
igt_plane_t *plane;
unsigned tested = 0;
- igt_skip_on(data->pipe >= data->display.n_pipes);
+ igt_skip_on((data->pipe >= data->display.n_pipes) ||
+ !(data->display.pipes[data->pipe].enabled));
igt_display_require_output_on_pipe(&data->display, data->pipe);
igt_skip_on(!igt_display_has_format_mod(&data->display,
DRM_FORMAT_XRGB8888, modifier));
diff --git a/tests/kms_plane_multiple.c b/tests/kms_plane_multiple.c
index 6cf060b3..e7b5951c 100644
--- a/tests/kms_plane_multiple.c
+++ b/tests/kms_plane_multiple.c
@@ -378,7 +378,8 @@ static void
run_tests_for_pipe(data_t *data, enum pipe pipe)
{
igt_fixture {
- igt_skip_on(pipe >= data->display.n_pipes);
+ igt_skip_on((pipe >= data->display.n_pipes) ||
+ !(data->display.pipes[pipe].enabled));
igt_require(data->display.pipes[pipe].n_planes > 0);
}
diff --git a/tests/kms_universal_plane.c b/tests/kms_universal_plane.c
index 676be633..ce28b37d 100644
--- a/tests/kms_universal_plane.c
+++ b/tests/kms_universal_plane.c
@@ -135,7 +135,8 @@ functional_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output)
int num_primary = 0, num_cursor = 0;
int i;
- igt_skip_on(pipe >= display->n_pipes);
+ igt_skip_on((pipe >= display->n_pipes) ||
+ !(display->pipes[pipe].enabled));
igt_info("Testing connector %s using pipe %s\n", igt_output_name(output),
kmstest_pipe_name(pipe));
@@ -364,7 +365,8 @@ sanity_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output)
int i;
int expect;
- igt_skip_on(pipe >= data->display.n_pipes);
+ igt_skip_on((pipe >= data->display.n_pipes) ||
+ !(data->display.pipes[pipe].enabled));
igt_output_set_pipe(output, pipe);
mode = igt_output_get_mode(output);
@@ -476,7 +478,8 @@ pageflip_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output)
fd_set fds;
int ret = 0;
- igt_skip_on(pipe >= data->display.n_pipes);
+ igt_skip_on((pipe >= data->display.n_pipes) ||
+ !(data->display.pipes[pipe].enabled));
igt_output_set_pipe(output, pipe);
@@ -577,7 +580,8 @@ cursor_leak_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output)
int r, g, b;
int count1, count2;
- igt_skip_on(pipe >= display->n_pipes);
+ igt_skip_on((pipe >= display->n_pipes) ||
+ !(display->pipes[pipe].enabled));
igt_require(display->has_cursor_plane);
igt_output_set_pipe(output, pipe);
@@ -705,7 +709,8 @@ gen9_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output)
int ret = 0;
igt_skip_on(data->gen < 9);
- igt_skip_on(pipe >= data->display.n_pipes);
+ igt_skip_on((pipe >= data->display.n_pipes) ||
+ !(data->display.pipes[pipe].enabled));
igt_output_set_pipe(output, pipe);
@@ -750,7 +755,8 @@ run_tests_for_pipe(data_t *data, enum pipe pipe)
igt_fixture {
int valid_tests = 0;
- igt_skip_on(pipe >= data->display.n_pipes);
+ igt_skip_on((pipe >= data->display.n_pipes) ||
+ !(data->display.pipes[pipe].enabled));
for_each_valid_output_on_pipe(&data->display, pipe, output)
valid_tests++;
--
2.24.1
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
next prev parent reply other threads:[~2020-06-17 17:54 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-10 19:37 [igt-dev] [[RFC] i-g-t 0/1] lib/igt_kms: Add support for display with Mohammed Khajapasha
2020-06-10 19:37 ` [igt-dev] [[RFC] i-g-t 1/1] lib/igt_kms: Add support for display with non-contiguous pipes Mohammed Khajapasha
2020-06-16 13:43 ` Petri Latvala
2020-06-17 11:20 ` Khajapasha, Mohammed
2020-06-17 11:27 ` Petri Latvala
2020-06-17 12:11 ` Khajapasha, Mohammed
2020-06-17 17:45 ` [igt-dev] [PATCH i-g-t v2 0/6] lib/igt_kms: Add support for display with Mohammed Khajapasha
2020-06-17 17:45 ` [igt-dev] [PATCH i-g-t v2 1/6] lib/igt_kms: Add support for display with non-contiguous pipes Mohammed Khajapasha
2020-06-17 17:45 ` [igt-dev] [PATCH i-g-t v2 2/6] tests/kms_cursor_legacy: Read crtc id for enable pipes Mohammed Khajapasha
2020-06-17 17:45 ` [igt-dev] [PATCH i-g-t v2 3/6] tests/kms_lease: Get pipe from crtc " Mohammed Khajapasha
2020-06-17 17:45 ` [igt-dev] [PATCH i-g-t v2 4/6] tests/kms_lease: Read crtc id for a valid pipe Mohammed Khajapasha
2020-06-17 17:45 ` [igt-dev] [PATCH i-g-t v2 5/6] lib/kms: Skip igt test cases for disabled display pipes Mohammed Khajapasha
2020-06-17 17:45 ` [igt-dev] [PATCH i-g-t v2 6/6] tests/kms: Skip kms test cases for disabled pipes Mohammed Khajapasha
2020-06-17 17:52 ` [igt-dev] [PATCH i-g-t 0/6] lib/igt_kms: Add support for display with Mohammed Khajapasha
2020-06-17 17:52 ` [igt-dev] [PATCH i-g-t 1/6] lib/igt_kms: Add support for display with non-contiguous pipes Mohammed Khajapasha
2020-06-17 17:52 ` [igt-dev] [PATCH i-g-t 2/6] tests/kms_cursor_legacy: Read crtc id for enable pipes Mohammed Khajapasha
2020-06-17 17:52 ` [igt-dev] [PATCH i-g-t 3/6] tests/kms_lease: Get pipe from crtc " Mohammed Khajapasha
2020-06-17 17:52 ` [igt-dev] [PATCH i-g-t 4/6] tests/kms_lease: Read crtc id for a valid pipe Mohammed Khajapasha
2020-06-17 17:52 ` [igt-dev] [PATCH i-g-t 5/6] lib/kms: Skip igt test cases for disabled display pipes Mohammed Khajapasha
2020-06-17 17:52 ` Mohammed Khajapasha [this message]
2020-06-10 20:15 ` [igt-dev] ✓ Fi.CI.BAT: success for i-g-t 1/1] lib/igt_kms: Add support for display with non-contiguous pipes Patchwork
2020-06-11 11:07 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork
-- strict thread matches above, loose matches on Subject: below --
2020-06-17 18:03 [igt-dev] [PATCH i-g-t 0/6] lib/igt_kms: Add support for display with Mohammed Khajapasha
2020-06-17 18:03 ` [igt-dev] [PATCH i-g-t 6/6] tests/kms: Skip kms test cases for disabled pipes Mohammed Khajapasha
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=20200617175254.17659-7-mohammed.khajapasha@intel.com \
--to=mohammed.khajapasha@intel.com \
--cc=arkadiusz.hiler@intel.com \
--cc=igt-dev@lists.freedesktop.org \
--cc=kishore.kunche@intel.com \
--cc=petri.latvala@intel.com \
--cc=suresh.kumar.kurmi@intel.com \
/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