diff options
| author | Emil Velikov <[email protected]> | 2015-06-29 14:03:22 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2015-07-13 19:57:59 +0100 |
| commit | dd50ccf0f4dcba2fd586d5b5c58750259e29c357 (patch) | |
| tree | c7c8baf42bb5799ae34c8185eb580ebe430c436e | |
| parent | cc32d25454c382a971e81ae584a4296fdf492e70 (diff) | |
auxiliary/vl: use loader_open_device() over open()
The former handles O_CLOEXEC (and the lack of it) appropriately.
Signed-off-by: Emil Velikov <[email protected]>
Reviewed-by: Francisco Jerez <[email protected]>
| -rw-r--r-- | src/gallium/auxiliary/Makefile.am | 1 | ||||
| -rw-r--r-- | src/gallium/auxiliary/vl/vl_winsys_dri.c | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am index ab91062ef1b..04f77d002c8 100644 --- a/src/gallium/auxiliary/Makefile.am +++ b/src/gallium/auxiliary/Makefile.am @@ -8,6 +8,7 @@ include $(top_srcdir)/src/gallium/Automake.inc noinst_LTLIBRARIES = libgallium.la AM_CFLAGS = \ + -I$(top_srcdir)/src/loader \ -I$(top_builddir)/src/glsl/nir \ -I$(top_srcdir)/src/gallium/auxiliary/util \ $(GALLIUM_CFLAGS) \ diff --git a/src/gallium/auxiliary/vl/vl_winsys_dri.c b/src/gallium/auxiliary/vl/vl_winsys_dri.c index 8e39569f515..b445f68a1c7 100644 --- a/src/gallium/auxiliary/vl/vl_winsys_dri.c +++ b/src/gallium/auxiliary/vl/vl_winsys_dri.c @@ -37,6 +37,8 @@ #include <xf86drm.h> #include <errno.h> +#include "loader.h" + #include "pipe/p_screen.h" #include "pipe/p_context.h" #include "pipe/p_state.h" @@ -361,7 +363,7 @@ vl_screen_create(Display *display, int screen) if (!device_name) goto free_connect; memcpy(device_name, xcb_dri2_connect_device_name(connect), device_name_length); - fd = open(device_name, O_RDWR); + fd = loader_open_device(device_name); free(device_name); if (fd < 0) |