[Mesa-dev] [PATCH] freedreno/drm: Move drm_msm.h to include/drm-uapi

[Chad Versace]

So the future Vulkan driver can share it.

I tested Meson, but not Autotools nor Android.mk.

Signed-off-by: Chad Versace <chadversary at chromium.org>
---
 Makefile.am                                                    | 1 +
 .../drivers/freedreno/drm => include/drm-uapi}/msm_drm.h       | 0
 src/gallium/drivers/freedreno/Android.mk                       | 1 +
 src/gallium/drivers/freedreno/Makefile.am                      | 1 +
 src/gallium/drivers/freedreno/Makefile.sources                 | 1 -
 src/gallium/drivers/freedreno/meson.build                      | 3 +--
 6 files changed, 4 insertions(+), 3 deletions(-)
 rename {src/gallium/drivers/freedreno/drm => include/drm-uapi}/msm_drm.h (100%)

diff --git a/Makefile.am b/Makefile.am
index 9e27db046e5..99234a4af58 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -76,6 +76,7 @@ noinst_HEADERS = \
 	include/drm-uapi/drm_fourcc.h \
 	include/drm-uapi/drm_mode.h \
 	include/drm-uapi/i915_drm.h \
+	include/drm-uapi/msm_drm.h \
 	include/drm-uapi/tegra_drm.h \
 	include/drm-uapi/v3d_drm.h \
 	include/drm-uapi/vc4_drm.h \
diff --git a/src/gallium/drivers/freedreno/drm/msm_drm.h b/include/drm-uapi/msm_drm.h
similarity index 100%
rename from src/gallium/drivers/freedreno/drm/msm_drm.h
rename to include/drm-uapi/msm_drm.h
diff --git a/src/gallium/drivers/freedreno/Android.mk b/src/gallium/drivers/freedreno/Android.mk
index 9c9d0707ba9..9cf036d0472 100644
--- a/src/gallium/drivers/freedreno/Android.mk
+++ b/src/gallium/drivers/freedreno/Android.mk
@@ -39,6 +39,7 @@ LOCAL_SRC_FILES := \
 #	-Wno-packed-bitfield-compat
 
 LOCAL_C_INCLUDES := \
+	$(MESA_TOP)/include/drm-uapi \
 	$(LOCAL_PATH)/ir3
 
 LOCAL_GENERATED_SOURCES := $(MESA_GEN_NIR_H)
diff --git a/src/gallium/drivers/freedreno/Makefile.am b/src/gallium/drivers/freedreno/Makefile.am
index 5690b6ec884..a6b336ec720 100644
--- a/src/gallium/drivers/freedreno/Makefile.am
+++ b/src/gallium/drivers/freedreno/Makefile.am
@@ -3,6 +3,7 @@ include $(top_srcdir)/src/gallium/Automake.inc
 
 AM_CFLAGS = \
 	-Wno-packed-bitfield-compat \
+	-I$(top_srcdir)/include/drm-uapi \
 	-I$(top_srcdir)/src/gallium/drivers/freedreno/ir3 \
 	-I$(top_builddir)/src/compiler/nir \
 	-I$(top_srcdir)/src/compiler/nir \
diff --git a/src/gallium/drivers/freedreno/Makefile.sources b/src/gallium/drivers/freedreno/Makefile.sources
index 8b4d61c9884..a03f55d53e6 100644
--- a/src/gallium/drivers/freedreno/Makefile.sources
+++ b/src/gallium/drivers/freedreno/Makefile.sources
@@ -51,7 +51,6 @@ drm_SOURCES := \
 	drm/freedreno_ringbuffer.h \
 	drm/msm_bo.c \
 	drm/msm_device.c \
-	drm/msm_drm.h \
 	drm/msm_pipe.c \
 	drm/msm_priv.h \
 	drm/msm_ringbuffer.c \
diff --git a/src/gallium/drivers/freedreno/meson.build b/src/gallium/drivers/freedreno/meson.build
index 4024d2fa99f..122eb53b797 100644
--- a/src/gallium/drivers/freedreno/meson.build
+++ b/src/gallium/drivers/freedreno/meson.build
@@ -81,7 +81,6 @@ files_libfreedreno = files(
   'drm/freedreno_ringbuffer.h',
   'drm/msm_bo.c',
   'drm/msm_device.c',
-  'drm/msm_drm.h',
   'drm/msm_pipe.c',
   'drm/msm_priv.h',
   'drm/msm_ringbuffer.c',
@@ -254,7 +253,7 @@ files_libfreedreno = files(
 )
 
 freedreno_includes = [
-  inc_src, inc_include, inc_gallium, inc_gallium_aux,
+  inc_src, inc_include, inc_drm_uapi, inc_gallium, inc_gallium_aux,
   include_directories('ir3')
 ]
 
-- 
2.19.1.930.g4563a0d9d0-goog