public inbox for igt-dev@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Mohammed Khajapasha <mohammed.khajapasha@intel.com>
To: suresh.kumar.kurmi@intel.com, kishore.kunche@intel.com,
	petri.latvala@intel.com, mohammed.khajapasha@freedesktop.org,
	arkadiusz.hiler@intel.com, igt-dev@lists.freedesktop.org
Subject: [igt-dev] [PATCH i-g-t v2 5/6] lib/kms: Skip igt test cases for disabled display pipes
Date: Wed, 17 Jun 2020 23:15:49 +0530	[thread overview]
Message-ID: <20200617174550.17589-6-mohammed.khajapasha@intel.com> (raw)
In-Reply-To: <20200617174550.17589-1-mohammed.khajapasha@intel.com>

Skip igt test cases for disabled pipes.

Signed-off-by: Mohammed Khajapasha <mohammed.khajapasha@intel.com>
---
 lib/igt_kms.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index 277d5c37..134b54dd 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -2162,8 +2162,9 @@ void igt_display_require_output_on_pipe(igt_display_t *display, enum pipe pipe)
 {
 	igt_output_t *output;
 
-	igt_skip_on_f(pipe >= igt_display_get_n_pipes(display),
-		      "Pipe %s does not exist.\n", kmstest_pipe_name(pipe));
+	igt_skip_on_f(((pipe >= igt_display_get_n_pipes(display)) ||
+				!(display->pipes[pipe].enabled)),
+			"Pipe %s does not exist or not enabled.\n", kmstest_pipe_name(pipe));
 
 	for_each_valid_output_on_pipe(display, pipe, output)
 		return;
@@ -2518,7 +2519,8 @@ igt_output_t *igt_get_single_output_for_pipe(igt_display_t *display, enum pipe p
 	igt_output_t *chosen_outputs[display->n_pipes];
 
 	igt_assert(pipe != PIPE_NONE);
-	igt_require(pipe < display->n_pipes);
+	igt_require((pipe < display->n_pipes) &&
+			display->pipes[pipe].enabled);
 
 	__igt_pipe_populate_outputs(display, chosen_outputs);
 
-- 
2.24.1

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

  parent reply	other threads:[~2020-06-17 17:47 UTC|newest]

Thread overview: 22+ 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     ` Mohammed Khajapasha [this message]
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     ` [igt-dev] [PATCH i-g-t 6/6] tests/kms: Skip kms test cases for disabled pipes Mohammed Khajapasha
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

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=20200617174550.17589-6-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=mohammed.khajapasha@freedesktop.org \
    --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