diff options
author | Emil Velikov <emil.l.velikov@gmail.com> | 2015-06-30 15:53:27 +0100 |
---|---|---|
committer | Emil Velikov <emil.l.velikov@gmail.com> | 2015-07-13 19:56:39 +0100 |
commit | a27ec5dc460b91dc44675f48cddbbb2631ee824f (patch) | |
tree | 8d5a7149b7b5dcccd394cd184b0f894d083f666e /src/gallium/auxiliary | |
parent | 69a1b9959e59653da262185c4e2cf57d24939b19 (diff) | |
download | external_mesa3d-a27ec5dc460b91dc44675f48cddbbb2631ee824f.zip external_mesa3d-a27ec5dc460b91dc44675f48cddbbb2631ee824f.tar.gz external_mesa3d-a27ec5dc460b91dc44675f48cddbbb2631ee824f.tar.bz2 |
pipe-loader: simplify pipe_loader_drm_probe
Do not iterate and (attempt to) open the render device, if we're over
the requested number of devices.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Francisco Jerez <currojerez@riseup.net>
Diffstat (limited to 'src/gallium/auxiliary')
-rw-r--r-- | src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c b/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c index 009e1df..1ff5f3e 100644 --- a/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c +++ b/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c @@ -180,12 +180,13 @@ 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; i++) { + i <= DRM_RENDER_NODE_MAX_MINOR && j < ndev; i++) { + fd = open_drm_render_node_minor(i); - struct pipe_loader_device *dev; if (fd < 0) continue; @@ -194,13 +195,7 @@ pipe_loader_drm_probe(struct pipe_loader_device **devs, int ndev) continue; } - if (j < ndev) { - devs[j] = dev; - } else { - close(fd); - dev->ops->release(&dev); - } - j++; + devs[j++] = dev; } return j; |