From e42d2948d3c58b86d3770d296b96fafcd1218858 Mon Sep 17 00:00:00 2001 From: Francisco Jerez Date: Wed, 29 Jul 2015 15:37:52 +0300 Subject: Revert "pipe-loader: simplify pipe_loader_drm_probe" This reverts commit a27ec5dc460b91dc44675f48cddbbb2631ee824f. It breaks the intended behaviour of pipe_loader_probe() with ndev==0 as relied upon by clover to query the number of devices available to the pipe loader in the system. Acked-by: Emil Velikov --- src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c b/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c index cc6d74a964b..1799df7e4c5 100644 --- a/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c +++ b/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c @@ -101,13 +101,12 @@ open_drm_render_node_minor(int minor) int pipe_loader_drm_probe(struct pipe_loader_device **devs, int ndev) { - struct pipe_loader_device *dev; int i, j, fd; for (i = DRM_RENDER_NODE_MIN_MINOR, j = 0; - i <= DRM_RENDER_NODE_MAX_MINOR && j < ndev; i++) { - + i <= DRM_RENDER_NODE_MAX_MINOR; i++) { fd = open_drm_render_node_minor(i); + struct pipe_loader_device *dev; if (fd < 0) continue; @@ -116,7 +115,13 @@ pipe_loader_drm_probe(struct pipe_loader_device **devs, int ndev) continue; } - devs[j++] = dev; + if (j < ndev) { + devs[j] = dev; + } else { + close(fd); + dev->ops->release(&dev); + } + j++; } return j; -- cgit v1.2.3