public inbox for igt-dev@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Chris Wilson <chris@chris-wilson.co.uk>
To: igt-dev@lists.freedesktop.org
Subject: [igt-dev] [PATCH i-g-t] lib/chamelium: Check drmModeGetResources()
Date: Fri,  5 Oct 2018 09:08:02 +0100	[thread overview]
Message-ID: <20181005080802.11082-1-chris@chris-wilson.co.uk> (raw)

If KMS is not available, drmModeGetResoures() reports NULL and so we
cannot use this device to find the chamelium connector.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 lib/igt_chamelium.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/igt_chamelium.c b/lib/igt_chamelium.c
index fe5c4dac..3150f609 100644
--- a/lib/igt_chamelium.c
+++ b/lib/igt_chamelium.c
@@ -1422,6 +1422,10 @@ static bool chamelium_read_port_mappings(struct chamelium *chamelium,
 	int port_i, i, j;
 	bool ret = true;
 
+	res = drmModeGetResources(drm_fd);
+	if (!res)
+		return false;
+
 	group_list = g_key_file_get_groups(igt_key_file, NULL);
 
 	/* Count how many connector mappings are specified in the config */
@@ -1433,7 +1437,6 @@ static bool chamelium_read_port_mappings(struct chamelium *chamelium,
 	chamelium->ports = calloc(sizeof(struct chamelium_port),
 				  chamelium->port_count);
 	port_i = 0;
-	res = drmModeGetResources(drm_fd);
 
 	for (i = 0; group_list[i] != NULL; i++) {
 		group = group_list[i];
@@ -1494,8 +1497,8 @@ static bool chamelium_read_port_mappings(struct chamelium *chamelium,
 	}
 
 out:
-	drmModeFreeResources(res);
 	g_strfreev(group_list);
+	drmModeFreeResources(res);
 
 	return ret;
 }
-- 
2.19.0

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

             reply	other threads:[~2018-10-05  8:08 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-05  8:08 Chris Wilson [this message]
2018-10-05 12:14 ` [igt-dev] ✓ Fi.CI.BAT: success for lib/chamelium: Check drmModeGetResources() Patchwork
2018-10-05 17:18 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork
2018-10-15 21:40 ` [igt-dev] [PATCH i-g-t] " Souza, Jose

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=20181005080802.11082-1-chris@chris-wilson.co.uk \
    --to=chris@chris-wilson.co.uk \
    --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