From 70b64073f7d1bf56a30f7a809bd984d3ad688b9f Mon Sep 17 00:00:00 2001 From: Qiang Yu Date: Mon, 6 Jun 2016 12:29:16 -0400 Subject: [PATCH] drm: fix multi GPU drmGetDevices only return one device When multi GPU present, after drmFoldDuplicatedDevices merge same busid deveces, two different devices may be seperated by zero in local_devices[]. The for loop should check all local_devices instead of exit when meet a zero. Reviewed-by: Jim Qu Reviewed-by: Alex Deucher Signed-off-by: Qiang Yu --- xf86drm.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xf86drm.c b/xf86drm.c index 45aa5fc9..4fdcaf8f 100644 --- a/xf86drm.c +++ b/xf86drm.c @@ -3267,7 +3267,10 @@ int drmGetDevices(drmDevicePtr devices[], int max_devices) drmFoldDuplicatedDevices(local_devices, node_count); device_count = 0; - for (i = 0; i < node_count && local_devices[i]; i++) { + for (i = 0; i < node_count; i++) { + if (!local_devices[i]) + continue; + if ((devices != NULL) && (device_count < max_devices)) devices[device_count] = local_devices[i]; else