Merge tag 'tags/libdrm-2.4.66' into master

Tag libdrm-2.4.66 from git://anongit.freedesktop.org/mesa/drm

Signed-off-by: Sean Paul <seanpaul@chromium.org>

Conflicts:
	Android.mk
	Makefile.am
	configure.ac
	freedreno/Android.mk
	include/drm/drm_mode.h
	intel/Android.mk
	libkms/Android.mk
	nouveau/Android.mk
	radeon/Android.mk
	tegra/tegra.c
	tests/Makefile.am
	xf86drmMode.c
	xf86drmMode.h

Change-Id: I3186bde7f196d2f3438c4334591ee2a0c1371c96

4 files changed, 34 insertions, 17 deletions

diff --git a/tegra/Makefile.am b/tegra/Makefile.am
index a6474879..fb40be55 100644
--- a/tegra/Makefile.am
+++ b/tegra/Makefile.am
@@ -4,7 +4,6 @@ AM_CPPFLAGS = \
 
 AM_CFLAGS = \
         @PTHREADSTUBS_CFLAGS@ \
-        $(VISIBILITY_CFLAGS) \
         $(WARN_CFLAGS)
 
 libdrm_tegra_ladir = $(libdir)
@@ -21,3 +20,6 @@ libdrm_tegrainclude_HEADERS = tegra.h
 
 pkgconfigdir = @pkgconfigdir@
 pkgconfig_DATA = libdrm_tegra.pc
+
+TESTS = tegra-symbol-check
+EXTRA_DIST = $(TESTS)
diff --git a/tegra/private.h b/tegra/private.h
index 1b490d40..571caa56 100644
--- a/tegra/private.h
+++ b/tegra/private.h
@@ -28,7 +28,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include <libdrm.h>
+#include <libdrm_macros.h>
 #include <xf86atomic.h>
 
 #include "tegra.h"
diff --git a/tegra/tegra-symbol-check b/tegra/tegra-symbol-check
new file mode 100755
index 00000000..40208311
--- /dev/null
+++ b/tegra/tegra-symbol-check
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+# The following symbols (past the first five) are taken from the public headers.
+# A list of the latter should be available Makefile.sources/LIBDRM_FREEDRENO_H_FILES
+
+FUNCS=$(nm -D --format=bsd --defined-only ${1-.libs/libdrm_tegra.so} | awk '{print $3}'| while read func; do
+( grep -q "^$func$" || echo $func )  <<EOF
+__bss_start
+_edata
+_end
+_fini
+_init
+drm_tegra_bo_get_flags
+drm_tegra_bo_get_handle
+drm_tegra_bo_get_tiling
+drm_tegra_bo_map
+drm_tegra_bo_new
+drm_tegra_bo_ref
+drm_tegra_bo_set_flags
+drm_tegra_bo_set_tiling
+drm_tegra_bo_unmap
+drm_tegra_bo_unref
+drm_tegra_bo_wrap
+drm_tegra_close
+drm_tegra_new
+EOF
+done)
+
+test ! -n "$FUNCS" || echo $FUNCS
+test ! -n "$FUNCS"
diff --git a/tegra/tegra.c b/tegra/tegra.c
index a58a08a5..66f19e96 100644
--- a/tegra/tegra.c
+++ b/tegra/tegra.c
@@ -74,7 +74,6 @@ static int drm_tegra_wrap(struct drm_tegra **drmp, int fd, bool close)
         return 0;
 }
 
-drm_public
 int drm_tegra_new(struct drm_tegra **drmp, int fd)
 {
         bool supported = false;
@@ -95,7 +94,6 @@ int drm_tegra_new(struct drm_tegra **drmp, int fd)
         return drm_tegra_wrap(drmp, fd, false);
 }
 
-drm_public
 void drm_tegra_close(struct drm_tegra *drm)
 {
         if (!drm)
@@ -107,7 +105,6 @@ void drm_tegra_close(struct drm_tegra *drm)
         free(drm);
 }
 
-drm_public
 int drm_tegra_bo_new(struct drm_tegra_bo **bop, struct drm_tegra *drm,
                      uint32_t flags, uint32_t size)
 {
@@ -146,7 +143,6 @@ int drm_tegra_bo_new(struct drm_tegra_bo **bop, struct drm_tegra *drm,
         return 0;
 }
 
-drm_public
 int drm_tegra_bo_wrap(struct drm_tegra_bo **bop, struct drm_tegra *drm,
                       uint32_t handle, uint32_t flags, uint32_t size)
 {
@@ -170,7 +166,6 @@ int drm_tegra_bo_wrap(struct drm_tegra_bo **bop, struct drm_tegra *drm,
         return 0;
 }
 
-drm_public
 int drm_tegra_bo_name_ref(struct drm_tegra *drm, uint32_t name, uint32_t size,
                          struct drm_tegra_bo **bop)
 {
@@ -203,7 +198,6 @@ err:
         return ret;
 }
 
-drm_public
 int drm_tegra_bo_name_get(struct drm_tegra_bo *bo, uint32_t *name)
 {
         struct drm_gem_flink args;
@@ -227,7 +221,6 @@ int drm_tegra_bo_name_get(struct drm_tegra_bo *bo, uint32_t *name)
         return 0;
 }
 
-drm_public
 struct drm_tegra_bo *drm_tegra_bo_ref(struct drm_tegra_bo *bo)
 {
         if (bo)
@@ -236,14 +229,12 @@ struct drm_tegra_bo *drm_tegra_bo_ref(struct drm_tegra_bo *bo)
         return bo;
 }
 
-drm_public
 void drm_tegra_bo_unref(struct drm_tegra_bo *bo)
 {
         if (bo && atomic_dec_and_test(&bo->ref))
                 drm_tegra_bo_free(bo);
 }
 
-drm_public
 int drm_tegra_bo_get_handle(struct drm_tegra_bo *bo, uint32_t *handle)
 {
         if (!bo || !handle)
@@ -254,7 +245,6 @@ int drm_tegra_bo_get_handle(struct drm_tegra_bo *bo, uint32_t *handle)
         return 0;
 }
 
-drm_public
 int drm_tegra_bo_map(struct drm_tegra_bo *bo, void **ptr)
 {
         struct drm_tegra *drm = bo->drm;
@@ -287,7 +277,6 @@ int drm_tegra_bo_map(struct drm_tegra_bo *bo, void **ptr)
         return 0;
 }
 
-drm_public
 int drm_tegra_bo_unmap(struct drm_tegra_bo *bo)
 {
         if (!bo)
@@ -304,7 +293,6 @@ int drm_tegra_bo_unmap(struct drm_tegra_bo *bo)
         return 0;
 }
 
-drm_public
 int drm_tegra_bo_get_flags(struct drm_tegra_bo *bo, uint32_t *flags)
 {
         struct drm_tegra_gem_get_flags args;
@@ -328,7 +316,6 @@ int drm_tegra_bo_get_flags(struct drm_tegra_bo *bo, uint32_t *flags)
         return 0;
 }
 
-drm_public
 int drm_tegra_bo_set_flags(struct drm_tegra_bo *bo, uint32_t flags)
 {
         struct drm_tegra_gem_get_flags args;
@@ -350,7 +337,6 @@ int drm_tegra_bo_set_flags(struct drm_tegra_bo *bo, uint32_t flags)
         return 0;
 }
 
-drm_public
 int drm_tegra_bo_get_tiling(struct drm_tegra_bo *bo,
                             struct drm_tegra_bo_tiling *tiling)
 {
@@ -377,7 +363,6 @@ int drm_tegra_bo_get_tiling(struct drm_tegra_bo *bo,
         return 0;
 }
 
-drm_public
 int drm_tegra_bo_set_tiling(struct drm_tegra_bo *bo,
                             const struct drm_tegra_bo_tiling *tiling)
 {