Import libdrm 2.4.64

31 files changed, 104 insertions, 242 deletions

diff --git a/lib/libdrm/amdgpu/amdgpu-symbol-check b/lib/libdrm/amdgpu/amdgpu-symbol-check
index 7d748eedd..9a0b36cb3 100755
--- a/lib/libdrm/amdgpu/amdgpu-symbol-check
+++ b/lib/libdrm/amdgpu/amdgpu-symbol-check
@@ -1,11 +1,9 @@
-#!/bin/sh
-
-set -u
+#!/bin/bash
 
 # The following symbols (past the first five) are taken from the public headers.
 # A list of the latter should be available Makefile.am/libdrm_amdgpuinclude_HEADERS
 
-FUNCS=$($NM -D --format=bsd --defined-only ${1-.libs/libdrm_amdgpu.so} | awk '{print $3}' | while read func; do
+FUNCS=$(nm -D --format=bsd --defined-only ${1-.libs/libdrm_amdgpu.so} | awk '{print $3}' | while read func; do
 ( grep -q "^$func$" || echo $func )  <<EOF
 __bss_start
 _edata
@@ -18,57 +16,21 @@ amdgpu_bo_cpu_unmap
 amdgpu_bo_export
 amdgpu_bo_free
 amdgpu_bo_import
-amdgpu_bo_inc_ref
-amdgpu_bo_list_create_raw
-amdgpu_bo_list_destroy_raw
 amdgpu_bo_list_create
 amdgpu_bo_list_destroy
 amdgpu_bo_list_update
 amdgpu_bo_query_info
 amdgpu_bo_set_metadata
 amdgpu_bo_va_op
-amdgpu_bo_va_op_raw
 amdgpu_bo_wait_for_idle
 amdgpu_create_bo_from_user_mem
-amdgpu_cs_chunk_fence_info_to_data
-amdgpu_cs_chunk_fence_to_dep
-amdgpu_cs_create_semaphore
-amdgpu_cs_create_syncobj
-amdgpu_cs_create_syncobj2
 amdgpu_cs_ctx_create
-amdgpu_cs_ctx_create2
 amdgpu_cs_ctx_free
-amdgpu_cs_ctx_override_priority
-amdgpu_cs_destroy_semaphore
-amdgpu_cs_destroy_syncobj
-amdgpu_cs_export_syncobj
-amdgpu_cs_fence_to_handle
-amdgpu_cs_import_syncobj
 amdgpu_cs_query_fence_status
 amdgpu_cs_query_reset_state
-amdgpu_cs_query_reset_state2
-amdgpu_query_sw_info
-amdgpu_cs_signal_semaphore
 amdgpu_cs_submit
-amdgpu_cs_submit_raw
-amdgpu_cs_submit_raw2
-amdgpu_cs_syncobj_export_sync_file
-amdgpu_cs_syncobj_export_sync_file2
-amdgpu_cs_syncobj_import_sync_file
-amdgpu_cs_syncobj_import_sync_file2
-amdgpu_cs_syncobj_query
-amdgpu_cs_syncobj_reset
-amdgpu_cs_syncobj_signal
-amdgpu_cs_syncobj_timeline_signal
-amdgpu_cs_syncobj_timeline_wait
-amdgpu_cs_syncobj_transfer
-amdgpu_cs_syncobj_wait
-amdgpu_cs_wait_fences
-amdgpu_cs_wait_semaphore
 amdgpu_device_deinitialize
 amdgpu_device_initialize
-amdgpu_find_bo_by_cpu_mapping
-amdgpu_get_marketing_name
 amdgpu_query_buffer_size_alignment
 amdgpu_query_crtc_from_id
 amdgpu_query_firmware_version
@@ -78,13 +40,10 @@ amdgpu_query_heap_info
 amdgpu_query_hw_ip_count
 amdgpu_query_hw_ip_info
 amdgpu_query_info
-amdgpu_query_sensor_info
 amdgpu_read_mm_registers
 amdgpu_va_range_alloc
 amdgpu_va_range_free
 amdgpu_va_range_query
-amdgpu_vm_reserve_vmid
-amdgpu_vm_unreserve_vmid
 EOF
 done)
 
diff --git a/lib/libdrm/exynos/Makefile.am b/lib/libdrm/exynos/Makefile.am
index 76b185d30..f99f8981f 100644
--- a/lib/libdrm/exynos/Makefile.am
+++ b/lib/libdrm/exynos/Makefile.am
@@ -1,6 +1,5 @@
 AM_CFLAGS = \
 	$(WARN_CFLAGS) \
-	-fvisibility=hidden \
 	-I$(top_srcdir) \
 	$(PTHREADSTUBS_CFLAGS) \
 	-I$(top_srcdir)/include/drm
@@ -24,6 +23,5 @@ libdrm_exynosinclude_HEADERS = exynos_drmif.h
 pkgconfigdir = @pkgconfigdir@
 pkgconfig_DATA = libdrm_exynos.pc
 
-AM_TESTS_ENVIRONMENT = NM='$(NM)'
 TESTS = exynos-symbol-check
 EXTRA_DIST = $(TESTS)
diff --git a/lib/libdrm/exynos/exynos-symbol-check b/lib/libdrm/exynos/exynos-symbol-check
index d2c362e1f..1a1be89ea 100755
--- a/lib/libdrm/exynos/exynos-symbol-check
+++ b/lib/libdrm/exynos/exynos-symbol-check
@@ -1,11 +1,9 @@
-#!/bin/sh
-
-set -u
+#!/bin/bash
 
 # The following symbols (past the first five) are taken from the public headers.
 # A list of the latter should be available Makefile.am/libdrm_exynos*_HEADERS
 
-FUNCS=$($NM -D --format=bsd --defined-only ${1-.libs/libdrm_exynos.so} | awk '{print $3}'| while read func; do
+FUNCS=$(nm -D --format=bsd --defined-only ${1-.libs/libdrm_exynos.so} | awk '{print $3}'| while read func; do
 ( grep -q "^$func$" || echo $func )  <<EOF
 __bss_start
 _edata
@@ -24,15 +22,12 @@ exynos_device_destroy
 exynos_prime_fd_to_handle
 exynos_prime_handle_to_fd
 exynos_vidi_connection
-exynos_handle_event
 g2d_blend
 g2d_copy
 g2d_copy_with_scale
 g2d_exec
-g2d_config_event
 g2d_fini
 g2d_init
-g2d_move
 g2d_scale_and_blend
 g2d_solid_fill
 EOF
diff --git a/lib/libdrm/freedreno/Makefile.am b/lib/libdrm/freedreno/Makefile.am
index 378450354..9b7ec7df9 100644
--- a/lib/libdrm/freedreno/Makefile.am
+++ b/lib/libdrm/freedreno/Makefile.am
@@ -3,10 +3,8 @@ include Makefile.sources
 
 AM_CFLAGS = \
 	$(WARN_CFLAGS) \
-	-fvisibility=hidden \
 	-I$(top_srcdir) \
 	$(PTHREADSTUBS_CFLAGS) \
-	$(VALGRIND_CFLAGS) \
 	-I$(top_srcdir)/include/drm
 
 libdrm_freedreno_la_LTLIBRARIES = libdrm_freedreno.la
@@ -28,6 +26,5 @@ libdrm_freedrenocommoninclude_HEADERS = $(LIBDRM_FREEDRENO_H_FILES)
 pkgconfigdir = @pkgconfigdir@
 pkgconfig_DATA = libdrm_freedreno.pc
 
-AM_TESTS_ENVIRONMENT = NM='$(NM)'
 TESTS = freedreno-symbol-check
-EXTRA_DIST = $(TESTS)
+EXTRA_DIST = Android.mk $(TESTS)
diff --git a/lib/libdrm/freedreno/freedreno-symbol-check b/lib/libdrm/freedreno/freedreno-symbol-check
index 987e38fa2..e593df4d7 100755
--- a/lib/libdrm/freedreno/freedreno-symbol-check
+++ b/lib/libdrm/freedreno/freedreno-symbol-check
@@ -1,11 +1,9 @@
-#!/bin/sh
-
-set -u
+#!/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_freedreno.so} | awk '{print $3}'| while read func; do
+FUNCS=$(nm -D --format=bsd --defined-only ${1-.libs/libdrm_freedreno.so} | awk '{print $3}'| while read func; do
 ( grep -q "^$func$" || echo $func )  <<EOF
 __bss_start
 _edata
@@ -20,44 +18,34 @@ fd_bo_from_dmabuf
 fd_bo_from_fbdev
 fd_bo_from_handle
 fd_bo_from_name
-fd_bo_get_iova
 fd_bo_get_name
 fd_bo_handle
 fd_bo_map
 fd_bo_new
-fd_bo_put_iova
 fd_bo_ref
 fd_bo_size
 fd_device_del
-fd_device_fd
 fd_device_new
 fd_device_new_dup
 fd_device_ref
-fd_device_version
 fd_pipe_del
 fd_pipe_get_param
 fd_pipe_new
-fd_pipe_new2
-fd_pipe_ref
 fd_pipe_wait
 fd_pipe_wait_timeout
-fd_ringbuffer_cmd_count
 fd_ringbuffer_del
 fd_ringbuffer_emit_reloc_ring
-fd_ringbuffer_emit_reloc_ring_full
 fd_ringbuffer_flush
-fd_ringbuffer_grow
 fd_ringbuffer_new
-fd_ringbuffer_new_flags
-fd_ringbuffer_new_object
-fd_ringbuffer_ref
 fd_ringbuffer_reloc
-fd_ringbuffer_reloc2
 fd_ringbuffer_reset
 fd_ringbuffer_set_parent
-fd_ringbuffer_size
 fd_ringbuffer_timestamp
-fd_ringbuffer_flush2
+fd_ringmarker_del
+fd_ringmarker_dwords
+fd_ringmarker_flush
+fd_ringmarker_mark
+fd_ringmarker_new
 EOF
 done)
 
diff --git a/lib/libdrm/intel/intel-symbol-check b/lib/libdrm/intel/intel-symbol-check
index 2f3553219..c555e6dae 100755
--- a/lib/libdrm/intel/intel-symbol-check
+++ b/lib/libdrm/intel/intel-symbol-check
@@ -1,11 +1,9 @@
-#!/bin/sh
-
-set -u
+#!/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_INTEL_H_FILES
 
-FUNCS=$($NM -D --format=bsd --defined-only ${1-.libs/libdrm_intel.so} | awk '{print $3}' | while read func; do
+FUNCS=$(nm -D --format=bsd --defined-only ${1-.libs/libdrm_intel.so} | awk '{print $3}' | while read func; do
 ( grep -q "^$func$" || echo $func )  <<EOF
 __bss_start
 _edata
@@ -36,13 +34,11 @@ drm_intel_bo_mrb_exec
 drm_intel_bo_pin
 drm_intel_bo_reference
 drm_intel_bo_references
-drm_intel_bo_set_softpin_offset
 drm_intel_bo_set_tiling
 drm_intel_bo_subdata
 drm_intel_bo_unmap
 drm_intel_bo_unpin
 drm_intel_bo_unreference
-drm_intel_bo_use_48b_address_range
 drm_intel_bo_wait_rendering
 drm_intel_bufmgr_check_aperture_space
 drm_intel_bufmgr_destroy
@@ -52,7 +48,6 @@ drm_intel_bufmgr_fake_init
 drm_intel_bufmgr_fake_set_exec_callback
 drm_intel_bufmgr_fake_set_fence_callback
 drm_intel_bufmgr_fake_set_last_dispatch
-drm_intel_bufmgr_gem_can_disable_implicit_sync
 drm_intel_bufmgr_gem_enable_fenced_relocs
 drm_intel_bufmgr_gem_enable_reuse
 drm_intel_bufmgr_gem_get_devid
@@ -72,13 +67,7 @@ drm_intel_decode_set_output_file
 drm_intel_gem_bo_aub_dump_bmp
 drm_intel_gem_bo_clear_relocs
 drm_intel_gem_bo_context_exec
-drm_intel_gem_bo_disable_implicit_sync
-drm_intel_gem_bo_enable_implicit_sync
-drm_intel_gem_bo_fence_exec
 drm_intel_gem_bo_get_reloc_count
-drm_intel_gem_bo_map__cpu
-drm_intel_gem_bo_map__gtt
-drm_intel_gem_bo_map__wc
 drm_intel_gem_bo_map_gtt
 drm_intel_gem_bo_map_unsynchronized
 drm_intel_gem_bo_start_gtt_access
@@ -86,12 +75,9 @@ drm_intel_gem_bo_unmap_gtt
 drm_intel_gem_bo_wait
 drm_intel_gem_context_create
 drm_intel_gem_context_destroy
-drm_intel_gem_context_get_id
 drm_intel_get_aperture_sizes
 drm_intel_get_eu_total
-drm_intel_get_min_eu_in_pool
 drm_intel_get_pipe_from_crtc_id
-drm_intel_get_pooled_eu
 drm_intel_get_reset_stats
 drm_intel_get_subslice_total
 drm_intel_reg_read
diff --git a/lib/libdrm/libkms/Makefile.am b/lib/libdrm/libkms/Makefile.am
index ff4c1b2a5..6c0ab7a28 100644
--- a/lib/libdrm/libkms/Makefile.am
+++ b/lib/libdrm/libkms/Makefile.am
@@ -2,7 +2,6 @@ include Makefile.sources
 
 AM_CFLAGS = \
 	$(WARN_CFLAGS) \
-	-fvisibility=hidden \
 	-I$(top_srcdir)/include/drm \
 	-I$(top_srcdir)
 
@@ -11,6 +10,10 @@ libkms_ladir = $(libdir)
 libkms_la_LDFLAGS = -version-number 1:0:0 -no-undefined
 libkms_la_LIBADD = ../libdrm.la
 
+#if HAVE_LIBUDEV
+#libkms_la_LIBADD += $(LIBUDEV_LIBS)
+#endif
+
 libkms_la_SOURCES = $(LIBKMS_FILES)
 
 if HAVE_VMWGFX
@@ -40,6 +43,5 @@ libkmsinclude_HEADERS = $(LIBKMS_H_FILES)
 pkgconfigdir = @pkgconfigdir@
 pkgconfig_DATA = libkms.pc
 
-AM_TESTS_ENVIRONMENT = NM='$(NM)'
 TESTS = kms-symbol-check
-EXTRA_DIST = $(TESTS)
+EXTRA_DIST = Android.mk $(TESTS)
diff --git a/lib/libdrm/libkms/kms-symbol-check b/lib/libdrm/libkms/kms-symbol-check
index 7d3426f6f..658b26926 100755
--- a/lib/libdrm/libkms/kms-symbol-check
+++ b/lib/libdrm/libkms/kms-symbol-check
@@ -1,11 +1,9 @@
-#!/bin/sh
-
-set -u
+#!/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/LIBKMS_H_FILES
 
-FUNCS=$($NM -D --format=bsd --defined-only ${1-.libs/libkms.so} | awk '{print $3}'| while read func; do
+FUNCS=$(nm -D --format=bsd --defined-only ${1-.libs/libkms.so} | awk '{print $3}'| while read func; do
 ( grep -q "^$func$" || echo $func )  <<EOF
 __bss_start
 _edata
diff --git a/lib/libdrm/man/drm-kms.xml b/lib/libdrm/man/drm-kms.xml
index eb04c263a..5f041578e 100644
--- a/lib/libdrm/man/drm-kms.xml
+++ b/lib/libdrm/man/drm-kms.xml
@@ -126,7 +126,7 @@
           <listitem>
             <para><emphasis>Framebuffers</emphasis> are abstract memory objects
                   that provide a source of pixel data to scanout to a CRTC.
-                  Applications explicitly request the creation of framebuffers
+                  Applications explicitely request the creation of framebuffers
                   and can control their behavior. Framebuffers rely on the
                   underneath memory manager for low-level memory operations.
                   When creating a framebuffer, applications pass a memory handle
@@ -309,8 +309,8 @@ static int modeset_find_crtc(int fd, drmModeRes *res, drmModeConnector *conn)
   <refsect1>
     <title>Reporting Bugs</title>
     <para>Bugs in this manual should be reported to
-      https://bugs.freedesktop.org/enter_bug.cgi?product=DRI&amp;component=libdrm
-      under the "DRI" product, component "libdrm"</para>
+          http://bugs.freedesktop.org under the "Mesa" product, with "Other" or
+          "libdrm" as the component.</para>
   </refsect1>
 
   <refsect1>
diff --git a/lib/libdrm/man/drm-memory.xml b/lib/libdrm/man/drm-memory.xml
index 3aa7cf259..6b4f0759b 100644
--- a/lib/libdrm/man/drm-memory.xml
+++ b/lib/libdrm/man/drm-memory.xml
@@ -410,8 +410,8 @@ memset(map, 0, creq.size);
   <refsect1>
     <title>Reporting Bugs</title>
     <para>Bugs in this manual should be reported to
-      https://bugs.freedesktop.org/enter_bug.cgi?product=DRI&amp;component=libdrm
-      under the "DRI" product, component "libdrm"</para>
+          http://bugs.freedesktop.org under the "Mesa" product, with "Other" or
+          "libdrm" as the component.</para>
   </refsect1>
 
   <refsect1>
diff --git a/lib/libdrm/man/drmAvailable.xml b/lib/libdrm/man/drmAvailable.xml
index 1e5d7873b..55bef94af 100644
--- a/lib/libdrm/man/drmAvailable.xml
+++ b/lib/libdrm/man/drmAvailable.xml
@@ -61,8 +61,8 @@
   <refsect1>
     <title>Reporting Bugs</title>
     <para>Bugs in this function should be reported to
-      https://bugs.freedesktop.org/enter_bug.cgi?product=DRI&amp;component=libdrm
-      under the "DRI" product, component "libdrm"</para>
+          http://bugs.freedesktop.org under the "Mesa" product, with "Other" or
+          "libdrm" as the component.</para>
   </refsect1>
 
   <refsect1>
diff --git a/lib/libdrm/man/drmHandleEvent.xml b/lib/libdrm/man/drmHandleEvent.xml
index 833044283..b1006e514 100644
--- a/lib/libdrm/man/drmHandleEvent.xml
+++ b/lib/libdrm/man/drmHandleEvent.xml
@@ -86,8 +86,8 @@ typedef struct _drmEventContext {
   <refsect1>
     <title>Reporting Bugs</title>
     <para>Bugs in this function should be reported to
-      https://bugs.freedesktop.org/enter_bug.cgi?product=DRI&amp;component=libdrm
-      under the "DRI" product, component "libdrm"</para>
+          http://bugs.freedesktop.org under the "Mesa" product, with "Other" or
+          "libdrm" as the component.</para>
   </refsect1>
 
   <refsect1>
diff --git a/lib/libdrm/man/drmModeGetResources.xml b/lib/libdrm/man/drmModeGetResources.xml
index 0ab6a68b1..2f5e8c2c5 100644
--- a/lib/libdrm/man/drmModeGetResources.xml
+++ b/lib/libdrm/man/drmModeGetResources.xml
@@ -116,8 +116,8 @@ typedef struct _drmModeRes {
   <refsect1>
     <title>Reporting Bugs</title>
     <para>Bugs in this function should be reported to
-      https://bugs.freedesktop.org/enter_bug.cgi?product=DRI&amp;component=libdrm
-      under the "DRI" product, component "libdrm"</para>
+          http://bugs.freedesktop.org under the "Mesa" product, with "Other" or
+          "libdrm" as the component.</para>
   </refsect1>
 
   <refsect1>
diff --git a/lib/libdrm/nouveau/Makefile.am b/lib/libdrm/nouveau/Makefile.am
index 5574fd8f3..25ea6dc15 100644
--- a/lib/libdrm/nouveau/Makefile.am
+++ b/lib/libdrm/nouveau/Makefile.am
@@ -2,7 +2,6 @@ include Makefile.sources
 
 AM_CFLAGS = \
 	$(WARN_CFLAGS) \
-	-fvisibility=hidden \
 	-I$(top_srcdir) \
 	$(PTHREADSTUBS_CFLAGS) \
 	-I$(top_srcdir)/include/drm \
@@ -15,21 +14,11 @@ libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
 
 libdrm_nouveau_la_SOURCES = $(LIBDRM_NOUVEAU_FILES)
 
-libdrm_nouveauincludedir = ${includedir}/libdrm/nouveau
+libdrm_nouveauincludedir = ${includedir}/libdrm
 libdrm_nouveauinclude_HEADERS = $(LIBDRM_NOUVEAU_H_FILES)
 
-libdrm_nouveaunvifincludedir = ${includedir}/libdrm/nouveau/nvif
-libdrm_nouveaunvifinclude_HEADERS = nvif/class.h \
-				    nvif/cl0080.h \
-				    nvif/cl9097.h \
-				    nvif/if0002.h \
-				    nvif/if0003.h \
-				    nvif/ioctl.h \
-				    nvif/unpack.h
-
 pkgconfigdir = @pkgconfigdir@
 pkgconfig_DATA = libdrm_nouveau.pc
 
-AM_TESTS_ENVIRONMENT = NM='$(NM)'
 TESTS = nouveau-symbol-check
-EXTRA_DIST = $(TESTS)
+EXTRA_DIST = Android.mk $(TESTS)
diff --git a/lib/libdrm/nouveau/nouveau-symbol-check b/lib/libdrm/nouveau/nouveau-symbol-check
index 36703a3e0..0fef56323 100755
--- a/lib/libdrm/nouveau/nouveau-symbol-check
+++ b/lib/libdrm/nouveau/nouveau-symbol-check
@@ -1,11 +1,9 @@
-#!/bin/sh
-
-set -u
+#!/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_NOUVEAU_H_FILES
 
-FUNCS=$($NM -D --format=bsd --defined-only ${1-.libs/libdrm_nouveau.so} | awk '{print $3}'| while read func; do
+FUNCS=$(nm -D --format=bsd --defined-only ${1-.libs/libdrm_nouveau.so} | awk '{print $3}'| while read func; do
 ( grep -q "^$func$" || echo $func )  <<EOF
 __bss_start
 _edata
@@ -29,19 +27,13 @@ nouveau_bufctx_reset
 nouveau_client_del
 nouveau_client_new
 nouveau_device_del
-nouveau_device_new
 nouveau_device_open
 nouveau_device_open_existing
 nouveau_device_wrap
-nouveau_drm_del
-nouveau_drm_new
 nouveau_getparam
 nouveau_object_del
-nouveau_object_mclass
-nouveau_object_mthd
+nouveau_object_find
 nouveau_object_new
-nouveau_object_sclass_get
-nouveau_object_sclass_put
 nouveau_pushbuf_bufctx
 nouveau_pushbuf_data
 nouveau_pushbuf_del
diff --git a/lib/libdrm/omap/Makefile.am b/lib/libdrm/omap/Makefile.am
index 38a1007b1..599bb9ded 100644
--- a/lib/libdrm/omap/Makefile.am
+++ b/lib/libdrm/omap/Makefile.am
@@ -1,6 +1,5 @@
 AM_CFLAGS = \
 	$(WARN_CFLAGS) \
-	-fvisibility=hidden \
 	-I$(top_srcdir) \
 	$(PTHREADSTUBS_CFLAGS) \
 	-I$(top_srcdir)/include/drm
@@ -21,6 +20,5 @@ libdrm_omapinclude_HEADERS = omap_drmif.h
 pkgconfigdir = @pkgconfigdir@
 pkgconfig_DATA = libdrm_omap.pc
 
-AM_TESTS_ENVIRONMENT = NM='$(NM)'
 TESTS = omap-symbol-check
 EXTRA_DIST = $(TESTS)
diff --git a/lib/libdrm/omap/omap-symbol-check b/lib/libdrm/omap/omap-symbol-check
index 21522ba04..759c84bd3 100755
--- a/lib/libdrm/omap/omap-symbol-check
+++ b/lib/libdrm/omap/omap-symbol-check
@@ -1,11 +1,9 @@
-#!/bin/sh
-
-set -u
+#!/bin/bash
 
 # The following symbols (past the first five) are taken from the public headers.
 # A list of the latter should be available Makefile.am/libdrm_omap*HEADERS
 
-FUNCS=$($NM -D --format=bsd --defined-only ${1-.libs/libdrm_omap.so} | awk '{print $3}'| while read func; do
+FUNCS=$(nm -D --format=bsd --defined-only ${1-.libs/libdrm_omap.so} | awk '{print $3}'| while read func; do
 ( grep -q "^$func$" || echo $func )  <<EOF
 __bss_start
 _edata
diff --git a/lib/libdrm/radeon/Makefile.am b/lib/libdrm/radeon/Makefile.am
index e712a4ac4..25c03d3cb 100644
--- a/lib/libdrm/radeon/Makefile.am
+++ b/lib/libdrm/radeon/Makefile.am
@@ -26,7 +26,6 @@ include Makefile.sources
 
 AM_CFLAGS = \
 	$(WARN_CFLAGS) \
-	-fvisibility=hidden \
 	-I$(top_srcdir) \
 	$(PTHREADSTUBS_CFLAGS) \
 	-I$(top_srcdir)/include/drm
@@ -44,6 +43,4 @@ libdrm_radeoninclude_HEADERS = $(LIBDRM_RADEON_H_FILES)
 pkgconfigdir = @pkgconfigdir@
 pkgconfig_DATA = libdrm_radeon.pc
 
-AM_TESTS_ENVIRONMENT = NM='$(NM)'
-TESTS = radeon-symbol-check
-EXTRA_DIST = $(LIBDRM_RADEON_BOF_FILES) $(TESTS)
+EXTRA_DIST = Android.mk $(LIBDRM_RADEON_BOF_FILES) $(TESTS)
diff --git a/lib/libdrm/tegra/Makefile.am b/lib/libdrm/tegra/Makefile.am
index 531199707..fb40be55a 100644
--- a/lib/libdrm/tegra/Makefile.am
+++ b/lib/libdrm/tegra/Makefile.am
@@ -4,8 +4,7 @@ AM_CPPFLAGS = \
 
 AM_CFLAGS = \
 	@PTHREADSTUBS_CFLAGS@ \
-	$(WARN_CFLAGS) \
-	-fvisibility=hidden
+	$(WARN_CFLAGS)
 
 libdrm_tegra_ladir = $(libdir)
 libdrm_tegra_la_LTLIBRARIES = libdrm_tegra.la
@@ -22,6 +21,5 @@ libdrm_tegrainclude_HEADERS = tegra.h
 pkgconfigdir = @pkgconfigdir@
 pkgconfig_DATA = libdrm_tegra.pc
 
-AM_TESTS_ENVIRONMENT = NM='$(NM)'
 TESTS = tegra-symbol-check
 EXTRA_DIST = $(TESTS)
diff --git a/lib/libdrm/tegra/tegra-symbol-check b/lib/libdrm/tegra/tegra-symbol-check
index a74d97497..402083112 100755
--- a/lib/libdrm/tegra/tegra-symbol-check
+++ b/lib/libdrm/tegra/tegra-symbol-check
@@ -1,16 +1,11 @@
-#!/bin/sh
+#!/bin/bash
 
-set -u
+# 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
 
-# The following symbols (past the first nine) are taken from tegra.h.
-
-FUNCS=$($NM -D --format=bsd --defined-only ${1-.libs/libdrm_tegra.so} | awk '{print $3}'| while read func; do
+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_end__
-__bss_start__
 __bss_start
-__end__
-_bss_end__
 _edata
 _end
 _fini
diff --git a/lib/libdrm/tests/Makefile.am b/lib/libdrm/tests/Makefile.am
index d274a3e90..9a2d9328a 100644
--- a/lib/libdrm/tests/Makefile.am
+++ b/lib/libdrm/tests/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = util kms modeprint proptest modetest vbltest
+SUBDIRS = modeprint proptest modetest vbltest
 
 if HAVE_LIBKMS
 SUBDIRS += kmstest
@@ -22,32 +22,51 @@ if HAVE_TEGRA
 SUBDIRS += tegra
 endif
 
-if HAVE_ETNAVIV
-SUBDIRS += etnaviv
-endif
-
-if HAVE_NOUVEAU
-SUBDIRS += nouveau
-endif
-
 AM_CFLAGS = \
 	$(WARN_CFLAGS)\
-	-fvisibility=hidden \
 	-I $(top_srcdir)/include/drm \
 	-I $(top_srcdir)
 
 LDADD = $(top_builddir)/libdrm.la
 
+check_PROGRAMS = \
+	dristat \
+	drmstat
+
+if HAVE_NOUVEAU
+SUBDIRS += nouveau
+endif
+
 TESTS = \
 	drmsl \
 	hash \
 	random
 
-check_PROGRAMS = \
-	$(TESTS)
+if HAVE_LIBUDEV
+
+check_LTLIBRARIES = libdrmtest.la
+
+libdrmtest_la_SOURCES = \
+	drmtest.c \
+	drmtest.h
 
-if HAVE_INSTALL_TESTS
-bin_PROGRAMS = drmdevice
-else
-check_PROGRAMS += drmdevice
+LDADD += \
+	libdrmtest.la \
+	$(LIBUDEV_LIBS)
+
+
+XFAIL_TESTS =					\
+	auth					\
+	lock
+
+TESTS +=					\
+	openclose				\
+	getversion				\
+	getclient				\
+	getstats				\
+	setversion				\
+	updatedraw				\
+	name_from_fd
 endif
+
+check_PROGRAMS += $(TESTS)
diff --git a/lib/libdrm/tests/amdgpu/Makefile.am b/lib/libdrm/tests/amdgpu/Makefile.am
index 920882d02..c1c3a32e0 100644
--- a/lib/libdrm/tests/amdgpu/Makefile.am
+++ b/lib/libdrm/tests/amdgpu/Makefile.am
@@ -1,9 +1,7 @@
 AM_CFLAGS = \
-	-fvisibility=hidden \
 	-I $(top_srcdir)/include/drm \
 	-I $(top_srcdir)/amdgpu \
-	-I $(top_srcdir) \
-	-pthread
+	-I $(top_srcdir)
 
 LDADD = $(top_builddir)/libdrm.la \
 	$(top_builddir)/amdgpu/libdrm_amdgpu.la \
@@ -25,14 +23,7 @@ amdgpu_test_SOURCES = \
 	basic_tests.c \
 	bo_tests.c \
 	cs_tests.c \
-	decode_messages.h \
+	uvd_messages.h \
 	vce_tests.c \
 	vce_ib.h \
-	frame.h \
-	uvd_enc_tests.c \
-	vcn_tests.c \
-	uve_ib.h \
-	deadlock_tests.c \
-	vm_tests.c	\
-	ras_tests.c \
-	syncobj_tests.c
+	frame.h
diff --git a/lib/libdrm/tests/exynos/Makefile.am b/lib/libdrm/tests/exynos/Makefile.am
index 9658fb427..b21d01696 100644
--- a/lib/libdrm/tests/exynos/Makefile.am
+++ b/lib/libdrm/tests/exynos/Makefile.am
@@ -1,43 +1,20 @@
 AM_CFLAGS = \
-	-pthread \
 	$(WARN_CFLAGS)\
-	-fvisibility=hidden \
 	-I $(top_srcdir)/include/drm \
 	-I $(top_srcdir)/libkms/ \
 	-I $(top_srcdir)/exynos \
 	-I $(top_srcdir)
 
-bin_PROGRAMS =
-noinst_PROGRAMS =
-
 if HAVE_LIBKMS
 if HAVE_INSTALL_TESTS
-bin_PROGRAMS += \
+bin_PROGRAMS = \
 	exynos_fimg2d_test
 else
-noinst_PROGRAMS += \
+noinst_PROGRAMS = \
 	exynos_fimg2d_test
 endif
 endif
 
-if HAVE_INSTALL_TESTS
-bin_PROGRAMS += \
-	exynos_fimg2d_perf \
-	exynos_fimg2d_event
-else
-noinst_PROGRAMS += \
-	exynos_fimg2d_perf \
-	exynos_fimg2d_event
-endif
-
-exynos_fimg2d_perf_LDADD = \
-	$(top_builddir)/libdrm.la \
-	$(top_builddir)/exynos/libdrm_exynos.la
-
-exynos_fimg2d_event_LDADD = \
-	$(top_builddir)/libdrm.la \
-	$(top_builddir)/exynos/libdrm_exynos.la
-
 exynos_fimg2d_test_LDADD = \
 	$(top_builddir)/libdrm.la \
 	$(top_builddir)/libkms/libkms.la \
diff --git a/lib/libdrm/tests/kmstest/Makefile.am b/lib/libdrm/tests/kmstest/Makefile.am
index 4c993b04e..fd21e612b 100644
--- a/lib/libdrm/tests/kmstest/Makefile.am
+++ b/lib/libdrm/tests/kmstest/Makefile.am
@@ -1,9 +1,7 @@
 AM_CFLAGS = \
 	$(WARN_CFLAGS)\
-	-fvisibility=hidden \
 	-I$(top_srcdir)/include/drm \
 	-I$(top_srcdir)/libkms/ \
-	-I$(top_srcdir)/tests/ \
 	-I$(top_srcdir)
 
 if HAVE_INSTALL_TESTS
@@ -18,9 +16,8 @@ kmstest_SOURCES = \
 	main.c
 
 kmstest_LDADD = \
-	$(top_builddir)/tests/util/libutil.la \
-	$(top_builddir)/libkms/libkms.la \
-	$(top_builddir)/libdrm.la
+	$(top_builddir)/libdrm.la \
+	$(top_builddir)/libkms/libkms.la
 
 run: kmstest
 	./kmstest
diff --git a/lib/libdrm/tests/modeprint/Makefile.am b/lib/libdrm/tests/modeprint/Makefile.am
index 568185f08..895805fd3 100644
--- a/lib/libdrm/tests/modeprint/Makefile.am
+++ b/lib/libdrm/tests/modeprint/Makefile.am
@@ -1,8 +1,6 @@
 AM_CFLAGS = \
 	$(WARN_CFLAGS)\
-	-fvisibility=hidden \
 	-I$(top_srcdir)/include/drm \
-	-I$(top_srcdir)/tests \
 	-I$(top_srcdir)
 
 if HAVE_INSTALL_TESTS
@@ -16,5 +14,4 @@ endif
 modeprint_SOURCES = \
 	modeprint.c
 modeprint_LDADD = \
-	$(top_builddir)/tests/util/libutil.la \
 	$(top_builddir)/libdrm.la
diff --git a/lib/libdrm/tests/modetest/Makefile.am b/lib/libdrm/tests/modetest/Makefile.am
index 5eebd9601..93820fac7 100644
--- a/lib/libdrm/tests/modetest/Makefile.am
+++ b/lib/libdrm/tests/modetest/Makefile.am
@@ -3,10 +3,7 @@ include Makefile.sources
 AM_CFLAGS = $(filter-out -Wpointer-arith, $(WARN_CFLAGS))
 
 AM_CFLAGS += \
-	-fvisibility=hidden \
-	-pthread \
 	-I$(top_srcdir)/include/drm \
-	-I$(top_srcdir)/tests \
 	-I$(top_srcdir)
 
 if HAVE_INSTALL_TESTS
@@ -21,5 +18,11 @@ modetest_SOURCES = $(MODETEST_FILES)
 
 modetest_LDADD = \
 	$(top_builddir)/libdrm.la \
-	$(top_builddir)/tests/util/libutil.la \
-	$(CAIRO_LIBS)
+	-lpthread
+
+if HAVE_CAIRO
+AM_CFLAGS += $(CAIRO_CFLAGS)
+modetest_LDADD += $(CAIRO_LIBS)
+endif
+
+EXTRA_DIST = Android.mk
diff --git a/lib/libdrm/tests/nouveau/Makefile.am b/lib/libdrm/tests/nouveau/Makefile.am
index 554f43ec0..c4f6e299f 100644
--- a/lib/libdrm/tests/nouveau/Makefile.am
+++ b/lib/libdrm/tests/nouveau/Makefile.am
@@ -1,15 +1,14 @@
-AM_CFLAGS = \
-	-pthread \
-	$(WARN_CFLAGS) \
-	-fvisibility=hidden \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)/include/drm \
 	-I$(top_srcdir)/nouveau \
 	-I$(top_srcdir)
 
+AM_CFLAGS = $(WARN_CFLAGS)
+
 LDADD = \
 	../../nouveau/libdrm_nouveau.la \
 	../../libdrm.la \
-	-ldl
+	-ldl -lpthread
 
 TESTS = threaded
 
diff --git a/lib/libdrm/tests/proptest/Makefile.am b/lib/libdrm/tests/proptest/Makefile.am
index 33b8705bc..0594e02e9 100644
--- a/lib/libdrm/tests/proptest/Makefile.am
+++ b/lib/libdrm/tests/proptest/Makefile.am
@@ -1,10 +1,6 @@
-include Makefile.sources
-
 AM_CFLAGS = \
 	$(WARN_CFLAGS)\
-	-fvisibility=hidden \
 	-I$(top_srcdir)/include/drm \
-	-I$(top_srcdir)/tests \
 	-I$(top_srcdir)
 
 if HAVE_INSTALL_TESTS
@@ -15,8 +11,7 @@ noinst_PROGRAMS = \
 	proptest
 endif
 
-proptest_SOURCES = $(PROPTEST_FILES)
-
+proptest_SOURCES = \
+	proptest.c
 proptest_LDADD = \
-	$(top_builddir)/libdrm.la \
-	$(top_builddir)/tests/util/libutil.la
+	$(top_builddir)/libdrm.la
diff --git a/lib/libdrm/tests/radeon/Makefile.am b/lib/libdrm/tests/radeon/Makefile.am
index 3d173e31a..9da762596 100644
--- a/lib/libdrm/tests/radeon/Makefile.am
+++ b/lib/libdrm/tests/radeon/Makefile.am
@@ -1,6 +1,5 @@
 AM_CFLAGS = \
 	$(WARN_CFLAGS)\
-	-fvisibility=hidden \
 	-I $(top_srcdir)/include/drm \
 	-I $(top_srcdir)
 
diff --git a/lib/libdrm/tests/tegra/Makefile.am b/lib/libdrm/tests/tegra/Makefile.am
index b462a30c7..8e625c8fe 100644
--- a/lib/libdrm/tests/tegra/Makefile.am
+++ b/lib/libdrm/tests/tegra/Makefile.am
@@ -3,9 +3,7 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/tegra \
 	-I$(top_srcdir)
 
-AM_CFLAGS = \
-	$(WARN_CFLAGS) \
-	-fvisibility=hidden
+AM_CFLAGS = $(WARN_CFLAGS)
 
 LDADD = \
 	../../tegra/libdrm_tegra.la \
diff --git a/lib/libdrm/tests/vbltest/Makefile.am b/lib/libdrm/tests/vbltest/Makefile.am
index b6cd7a4d7..4d87887a5 100644
--- a/lib/libdrm/tests/vbltest/Makefile.am
+++ b/lib/libdrm/tests/vbltest/Makefile.am
@@ -1,8 +1,6 @@
 AM_CFLAGS = \
 	$(WARN_CFLAGS)\
-	-fvisibility=hidden \
 	-I$(top_srcdir)/include/drm \
-	-I$(top_srcdir)/tests \
 	-I$(top_srcdir)
 
 if HAVE_INSTALL_TESTS
@@ -16,5 +14,4 @@ endif
 vbltest_SOURCES = \
 	vbltest.c
 vbltest_LDADD = \
-	$(top_builddir)/libdrm.la \
-	$(top_builddir)/tests/util/libutil.la
+	$(top_builddir)/libdrm.la