Mesa (master): anv,iris: unbreak on BSDs after 812cf5f522ab,abf8aed68047

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: fcdefa7e479541a92f02b1933f58439e0fd03a1f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=fcdefa7e479541a92f02b1933f58439e0fd03a1f

Author: Jan Beich <jbeich at FreeBSD.org>
Date:   Sat May 30 22:37:45 2020 +0000

anv,iris: unbreak on BSDs after 812cf5f522ab,abf8aed68047

../src/intel/vulkan/anv_gem.c:31:10: fatal error: 'linux/sync_file.h' file not found
 #include <linux/sync_file.h>
          ^~~~~~~~~~~~~~~~~~~
../src/gallium/drivers/iris/iris_fence.c:29:10: fatal error: 'linux/sync_file.h' file not found
 #include <linux/sync_file.h>
          ^~~~~~~~~~~~~~~~~~~

Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5463>

---

 src/gallium/drivers/iris/iris_fence.c | 3 +--
 src/intel/vulkan/anv_gem.c            | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/iris/iris_fence.c b/src/gallium/drivers/iris/iris_fence.c
index 8054f5f1fb7..4600c1c4238 100644
--- a/src/gallium/drivers/iris/iris_fence.c
+++ b/src/gallium/drivers/iris/iris_fence.c
@@ -26,8 +26,7 @@
  * Fences for driver and IPC serialisation, scheduling and synchronisation.
  */
 
-#include <linux/sync_file.h>
-
+#include "drm-uapi/sync_file.h"
 #include "util/u_debug.h"
 #include "util/u_inlines.h"
 #include "intel/common/gen_gem.h"
diff --git a/src/intel/vulkan/anv_gem.c b/src/intel/vulkan/anv_gem.c
index b1c727fb5ec..c3adc0c3cff 100644
--- a/src/intel/vulkan/anv_gem.c
+++ b/src/intel/vulkan/anv_gem.c
@@ -28,11 +28,11 @@
 #include <errno.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <linux/sync_file.h>
 
 #include "anv_private.h"
 #include "common/gen_defines.h"
 #include "common/gen_gem.h"
+#include "drm-uapi/sync_file.h"
 
 /**
  * Wrapper around DRM_IOCTL_I915_GEM_CREATE.