Import Mesa 21.1.5

2 files changed, 3 insertions, 1 deletions

diff --git a/lib/mesa/src/gallium/winsys/tegra/drm/meson.build b/lib/mesa/src/gallium/winsys/tegra/drm/meson.build
index 46a6ab782..c1102c8fd 100644
--- a/lib/mesa/src/gallium/winsys/tegra/drm/meson.build
+++ b/lib/mesa/src/gallium/winsys/tegra/drm/meson.build
@@ -25,6 +25,7 @@ libtegradrm = static_library(
     inc_include, inc_src, inc_gallium, inc_gallium_aux, inc_gallium_drivers,
     inc_gallium_winsys
   ],
+  dependencies : idep_mesautil,
 )
 
 driver_tegra = declare_dependency(
diff --git a/lib/mesa/src/gallium/winsys/tegra/drm/tegra_drm_winsys.c b/lib/mesa/src/gallium/winsys/tegra/drm/tegra_drm_winsys.c
index e2a8efb0f..9f1732a54 100644
--- a/lib/mesa/src/gallium/winsys/tegra/drm/tegra_drm_winsys.c
+++ b/lib/mesa/src/gallium/winsys/tegra/drm/tegra_drm_winsys.c
@@ -23,6 +23,7 @@
 
 #include <fcntl.h>
 
+#include "util/os_file.h"
 #include "util/u_debug.h"
 
 #include "tegra/tegra_screen.h"
@@ -37,7 +38,7 @@ struct pipe_screen *tegra_drm_screen_create(int fd)
     * NOTE: There are reportedly issues with reusing the file descriptor
     * as-is related to Xinerama. Duplicate it to side-step any issues.
     */
-   fd = fcntl(fd, F_DUPFD_CLOEXEC, 0);
+   fd = os_dupfd_cloexec(fd);
    if (fd < 0)
       return NULL;