loader: Rename drm_open_device() to loader_open_device() and share it

This is already our common idiom for opening files with CLOEXEC and
it's a little ugly, so let's share this one implementation.

Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
This commit is contained in:
Derek Foreman 2015-06-17 11:28:49 -05:00 committed by Emil Velikov
parent aaac913e90
commit 9c92746349
2 changed files with 6 additions and 3 deletions

View file

@ -314,8 +314,8 @@ get_id_path_tag_from_fd(struct udev *udev, int fd)
return id_path_tag;
}
static int
drm_open_device(const char *device_name)
int
loader_open_device(const char *device_name)
{
int fd;
#ifdef O_CLOEXEC
@ -404,7 +404,7 @@ int loader_get_user_preferred_fd(int default_fd, int *different_device)
goto default_device_clean;
}
fd = drm_open_device(device_name);
fd = loader_open_device(device_name);
if (fd >= 0) {
close(default_fd);
} else {

View file

@ -36,6 +36,9 @@ extern "C" {
#define _LOADER_DRI (1 << 0)
#define _LOADER_GALLIUM (1 << 1)
int
loader_open_device(const char *);
int
loader_get_pci_id_for_fd(int fd, int *vendor_id, int *chip_id);