From 0ac43db33e116b546e5704fe0b4dde21f391e09c Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Fri, 5 Oct 2018 09:07:02 +0100 Subject: lib/chamelium: Check drmModeGetResources() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: José Roberto de Souza --- lib/igt_chamelium.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'lib/igt_chamelium.c') diff --git a/lib/igt_chamelium.c b/lib/igt_chamelium.c index b8418e13..a80ead16 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; } -- cgit v1.2.3