Igt-dev Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
To: igt-dev@lists.freedesktop.org
Cc: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
Subject: [i-g-t 2/2] lib/igt_kms: Don't abort in lib helper
Date: Tue, 17 Sep 2024 15:14:22 +0530	[thread overview]
Message-ID: <20240917094422.938032-2-bhanuprakash.modem@intel.com> (raw)
In-Reply-To: <20240917094422.938032-1-bhanuprakash.modem@intel.com>

Instead of aborting from lib helper, simply return the
status to the caller and let the caller to decide to
abort/skip.

Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
---
 lib/igt_kms.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index 9313e4c27..b40470c02 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -6596,7 +6596,10 @@ bool intel_pipe_output_combo_valid(igt_display_t *display)
 		combo++;
 	}
 
-	igt_assert_f(combo, "At least one pipe/output combo needed.\n");
+	if (!combo) {
+		igt_info("At least one pipe/output combo needed.\n");
+		return false;
+	}
 
 	if (!is_intel_device(display->drm_fd))
 		return true;
-- 
2.43.0


  reply	other threads:[~2024-09-17  9:54 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-17  9:44 [i-g-t 1/2] lib/igt_kms: Add a debug log for invalid pipe/output combo Bhanuprakash Modem
2024-09-17  9:44 ` Bhanuprakash Modem [this message]
2024-09-18  8:12   ` [i-g-t 2/2] lib/igt_kms: Don't abort in lib helper Samala, Pranay
2024-09-17 10:56 ` ✗ GitLab.Pipeline: warning for series starting with [i-g-t,1/2] lib/igt_kms: Add a debug log for invalid pipe/output combo Patchwork
2024-09-17 11:23 ` ✓ Fi.CI.BAT: success " Patchwork
2024-09-17 11:44 ` ✓ CI.xeBAT: " Patchwork
2024-09-17 13:19 ` ✓ CI.xeFULL: " Patchwork
2024-09-18  5:31 ` ✗ Fi.CI.IGT: failure " Patchwork
2024-09-18  8:10 ` [i-g-t 1/2] " Samala, Pranay

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=20240917094422.938032-2-bhanuprakash.modem@intel.com \
    --to=bhanuprakash.modem@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