fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-06-16 21:58:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

pipe-loader: simplify pipe_loader_drm_probe

Browse source 
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>
This commit is contained in:
Emil Velikov 2015-06-30 15:53:27 +01:00
parent 69a1b9959e
commit a27ec5dc46
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
View file

@ -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;