freedreno: Move msm_drm.h to the same spot as other DRM uapi.

The new location matches other drivers, and has a README about the rules
for updating it.

Reviewed-by: Rob Clark <robdclark@gmail.com>

diff --git a/src/freedreno/drm/msm_drm.h b/include/drm-uapi/msm_drm.h
similarity index 100%
rename from src/freedreno/drm/msm_drm.h
rename to include/drm-uapi/msm_drm.h

diff --git a/src/freedreno/Makefile.sources b/src/freedreno/Makefile.sources
index a46a2c3..d8aaf2c 100644 (file)
--- 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 5679d14..cee996a 100644 (file)
--- 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 44fb777..acf22bc 100644 (file)
--- 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 aae72c7..2e930d9 100644 (file)
--- 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 6904b01..9b2e6f7 100644 (file)
--- 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 1c8bb87..c244047 100644 (file)
--- 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"