summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/drm-uapi/msm_drm.h (renamed from src/freedreno/drm/msm_drm.h)0
-rw-r--r--src/freedreno/Makefile.sources1
-rw-r--r--src/freedreno/drm/meson.build1
-rw-r--r--src/freedreno/drm/msm_priv.h2
-rw-r--r--src/freedreno/vulkan/tu_device.c2
-rw-r--r--src/freedreno/vulkan/tu_drm.c2
-rw-r--r--src/freedreno/vulkan/tu_private.h2
7 files changed, 4 insertions, 6 deletions
diff --git a/src/freedreno/drm/msm_drm.h b/include/drm-uapi/msm_drm.h
index 0baa2bfdd63..0baa2bfdd63 100644
--- a/src/freedreno/drm/msm_drm.h
+++ b/include/drm-uapi/msm_drm.h
diff --git a/src/freedreno/Makefile.sources b/src/freedreno/Makefile.sources
index a46a2c30913..d8aaf2caecc 100644
--- a/src/freedreno/Makefile.sources
+++ b/src/freedreno/Makefile.sources
@@ -12,7 +12,6 @@ drm_SOURCES := \
drm/msm_priv.h \
drm/freedreno_device.c \
drm/freedreno_priv.h \
- drm/msm_drm.h \
drm/msm_ringbuffer.c
ir3_SOURCES := \
diff --git a/src/freedreno/drm/meson.build b/src/freedreno/drm/meson.build
index 5679d147894..cee996acd7e 100644
--- a/src/freedreno/drm/meson.build
+++ b/src/freedreno/drm/meson.build
@@ -29,7 +29,6 @@ libfreedreno_drm_files = files(
'freedreno_ringbuffer.h',
'msm_bo.c',
'msm_device.c',
- 'msm_drm.h',
'msm_pipe.c',
'msm_priv.h',
'msm_ringbuffer.c',
diff --git a/src/freedreno/drm/msm_priv.h b/src/freedreno/drm/msm_priv.h
index 44fb777f988..acf22bcb6f8 100644
--- a/src/freedreno/drm/msm_priv.h
+++ b/src/freedreno/drm/msm_priv.h
@@ -33,7 +33,7 @@
# define __user
#endif
-#include "msm_drm.h"
+#include "drm-uapi/msm_drm.h"
struct msm_device {
struct fd_device base;
diff --git a/src/freedreno/vulkan/tu_device.c b/src/freedreno/vulkan/tu_device.c
index aae72c7a843..2e930d9841f 100644
--- a/src/freedreno/vulkan/tu_device.c
+++ b/src/freedreno/vulkan/tu_device.c
@@ -42,7 +42,7 @@
#include "vk_format.h"
#include "vk_util.h"
-#include "drm/msm_drm.h"
+#include "drm-uapi/msm_drm.h"
static int
tu_device_get_cache_uuid(uint16_t family, void *uuid)
diff --git a/src/freedreno/vulkan/tu_drm.c b/src/freedreno/vulkan/tu_drm.c
index 6904b011e71..9b2e6f78879 100644
--- a/src/freedreno/vulkan/tu_drm.c
+++ b/src/freedreno/vulkan/tu_drm.c
@@ -30,7 +30,7 @@
#include <sys/ioctl.h>
#include <xf86drm.h>
-#include "drm/msm_drm.h"
+#include "drm-uapi/msm_drm.h"
static int
tu_drm_get_param(const struct tu_physical_device *dev,
diff --git a/src/freedreno/vulkan/tu_private.h b/src/freedreno/vulkan/tu_private.h
index 1c8bb87e47b..c2440471f37 100644
--- a/src/freedreno/vulkan/tu_private.h
+++ b/src/freedreno/vulkan/tu_private.h
@@ -52,7 +52,7 @@
#include "vk_debug_report.h"
#include "wsi_common.h"
-#include "drm/msm_drm.h"
+#include "drm-uapi/msm_drm.h"
#include "ir3/ir3_compiler.h"
#include "ir3/ir3_shader.h"