Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[xsrc/xorg]: xsrc/external/mit/libdrm/dist initial import of libdrm-2.4.96
details: https://anonhg.NetBSD.org/xsrc/rev/98a3d4085850
branches: xorg
changeset: 10082:98a3d4085850
user: mrg <mrg%NetBSD.org@localhost>
date: Thu Jan 10 08:49:52 2019 +0000
description:
initial import of libdrm-2.4.96
diffstat:
external/mit/libdrm/dist/Makefile.am | 1 +
external/mit/libdrm/dist/Makefile.in | 15 +-
external/mit/libdrm/dist/Makefile.sources | 1 +
external/mit/libdrm/dist/amdgpu/Makefile.am | 2 +
external/mit/libdrm/dist/amdgpu/Makefile.in | 13 +-
external/mit/libdrm/dist/amdgpu/Makefile.sources | 6 +-
external/mit/libdrm/dist/amdgpu/amdgpu-symbol-check | 4 +
external/mit/libdrm/dist/amdgpu/amdgpu.h | 42 +-
external/mit/libdrm/dist/amdgpu/amdgpu_asic_id.c | 4 -
external/mit/libdrm/dist/amdgpu/amdgpu_bo.c | 371 +++--
external/mit/libdrm/dist/amdgpu/amdgpu_cs.c | 143 +-
external/mit/libdrm/dist/amdgpu/amdgpu_device.c | 100 +-
external/mit/libdrm/dist/amdgpu/amdgpu_gpu_info.c | 55 +-
external/mit/libdrm/dist/amdgpu/amdgpu_internal.h | 10 +-
external/mit/libdrm/dist/amdgpu/amdgpu_vamgr.c | 28 +-
external/mit/libdrm/dist/amdgpu/amdgpu_vm.c | 9 +-
external/mit/libdrm/dist/amdgpu/handle_table.c | 72 +
external/mit/libdrm/dist/amdgpu/handle_table.h | 41 +
external/mit/libdrm/dist/amdgpu/meson.build | 7 +-
external/mit/libdrm/dist/build-aux/compile | 2 +-
external/mit/libdrm/dist/build-aux/config.guess | 2 +-
external/mit/libdrm/dist/build-aux/config.sub | 2 +-
external/mit/libdrm/dist/build-aux/depcomp | 2 +-
external/mit/libdrm/dist/build-aux/ltmain.sh | 4 +-
external/mit/libdrm/dist/build-aux/missing | 2 +-
external/mit/libdrm/dist/build-aux/test-driver | 2 +-
external/mit/libdrm/dist/config.h.in | 2 +-
external/mit/libdrm/dist/configure | 37 +-
external/mit/libdrm/dist/configure.ac | 12 +-
external/mit/libdrm/dist/etnaviv/Makefile.am | 2 +
external/mit/libdrm/dist/etnaviv/Makefile.in | 2 +
external/mit/libdrm/dist/etnaviv/etnaviv-symbol-check | 2 +
external/mit/libdrm/dist/etnaviv/etnaviv_bo.c | 29 +-
external/mit/libdrm/dist/etnaviv/etnaviv_bo_cache.c | 4 -
external/mit/libdrm/dist/etnaviv/etnaviv_cmd_stream.c | 25 +-
external/mit/libdrm/dist/etnaviv/etnaviv_device.c | 14 +-
external/mit/libdrm/dist/etnaviv/etnaviv_drm.h | 7 +
external/mit/libdrm/dist/etnaviv/etnaviv_gpu.c | 10 +-
external/mit/libdrm/dist/etnaviv/etnaviv_perfmon.c | 12 +-
external/mit/libdrm/dist/etnaviv/etnaviv_pipe.c | 12 +-
external/mit/libdrm/dist/etnaviv/meson.build | 4 +-
external/mit/libdrm/dist/exynos/Makefile.am | 2 +
external/mit/libdrm/dist/exynos/Makefile.in | 2 +
external/mit/libdrm/dist/exynos/exynos-symbol-check | 2 +
external/mit/libdrm/dist/exynos/exynos_drm.c | 34 +-
external/mit/libdrm/dist/exynos/exynos_fimg2d.c | 24 +-
external/mit/libdrm/dist/exynos/meson.build | 2 +-
external/mit/libdrm/dist/freedreno/Makefile.am | 2 +
external/mit/libdrm/dist/freedreno/Makefile.in | 5 +-
external/mit/libdrm/dist/freedreno/Makefile.sources | 1 -
external/mit/libdrm/dist/freedreno/freedreno-symbol-check | 14 +-
external/mit/libdrm/dist/freedreno/freedreno_bo.c | 73 +-
external/mit/libdrm/dist/freedreno/freedreno_bo_cache.c | 10 +-
external/mit/libdrm/dist/freedreno/freedreno_device.c | 17 +-
external/mit/libdrm/dist/freedreno/freedreno_drmif.h | 1 +
external/mit/libdrm/dist/freedreno/freedreno_pipe.c | 25 +-
external/mit/libdrm/dist/freedreno/freedreno_priv.h | 27 +-
external/mit/libdrm/dist/freedreno/freedreno_ringbuffer.c | 127 +-
external/mit/libdrm/dist/freedreno/freedreno_ringbuffer.h | 65 +-
external/mit/libdrm/dist/freedreno/kgsl/kgsl_bo.c | 6 +-
external/mit/libdrm/dist/freedreno/kgsl/kgsl_device.c | 4 -
external/mit/libdrm/dist/freedreno/kgsl/kgsl_pipe.c | 4 -
external/mit/libdrm/dist/freedreno/kgsl/kgsl_priv.h | 2 +-
external/mit/libdrm/dist/freedreno/kgsl/kgsl_ringbuffer.c | 18 +-
external/mit/libdrm/dist/freedreno/meson.build | 4 +-
external/mit/libdrm/dist/freedreno/msm/msm_bo.c | 4 -
external/mit/libdrm/dist/freedreno/msm/msm_device.c | 7 -
external/mit/libdrm/dist/freedreno/msm/msm_pipe.c | 10 +-
external/mit/libdrm/dist/freedreno/msm/msm_priv.h | 39 +-
external/mit/libdrm/dist/freedreno/msm/msm_ringbuffer.c | 363 +++-
external/mit/libdrm/dist/include/drm/README | 13 +-
external/mit/libdrm/dist/include/drm/amdgpu_drm.h | 62 +-
external/mit/libdrm/dist/include/drm/drm.h | 16 +
external/mit/libdrm/dist/include/drm/drm_fourcc.h | 215 +++
external/mit/libdrm/dist/include/drm/drm_mode.h | 60 +-
external/mit/libdrm/dist/include/drm/i915_drm.h | 343 +++++-
external/mit/libdrm/dist/include/drm/msm_drm.h | 308 ++++
external/mit/libdrm/dist/include/drm/nouveau_drm.h | 1 +
external/mit/libdrm/dist/include/drm/qxl_drm.h | 2 -
external/mit/libdrm/dist/include/drm/tegra_drm.h | 492 +++++++-
external/mit/libdrm/dist/include/drm/vc4_drm.h | 83 +
external/mit/libdrm/dist/include/drm/virtgpu_drm.h | 1 +
external/mit/libdrm/dist/include/drm/vmwgfx_drm.h | 35 +-
external/mit/libdrm/dist/intel/Makefile.am | 2 +
external/mit/libdrm/dist/intel/Makefile.in | 7 +-
external/mit/libdrm/dist/intel/Makefile.sources | 2 +
external/mit/libdrm/dist/intel/i915_pciids.h | 461 +++++++
external/mit/libdrm/dist/intel/intel-symbol-check | 2 +
external/mit/libdrm/dist/intel/intel_bufmgr.c | 80 +-
external/mit/libdrm/dist/intel/intel_bufmgr_fake.c | 20 +-
external/mit/libdrm/dist/intel/intel_bufmgr_gem.c | 83 +-
external/mit/libdrm/dist/intel/intel_chipset.c | 85 +
external/mit/libdrm/dist/intel/intel_chipset.h | 213 +---
external/mit/libdrm/dist/intel/intel_decode.c | 24 +-
external/mit/libdrm/dist/intel/meson.build | 8 +-
external/mit/libdrm/dist/intel/mm.c | 4 -
external/mit/libdrm/dist/intel/mm.h | 4 -
external/mit/libdrm/dist/intel/test_decode.c | 8 +-
external/mit/libdrm/dist/libdrm_macros.h | 4 +-
external/mit/libdrm/dist/libkms/Makefile.am | 2 +
external/mit/libdrm/dist/libkms/Makefile.in | 5 +-
external/mit/libdrm/dist/libkms/api.c | 20 +-
external/mit/libdrm/dist/libkms/dumb.c | 4 -
external/mit/libdrm/dist/libkms/exynos.c | 4 -
external/mit/libdrm/dist/libkms/intel.c | 4 -
external/mit/libdrm/dist/libkms/internal.h | 4 -
external/mit/libdrm/dist/libkms/kms-symbol-check | 2 +
external/mit/libdrm/dist/libkms/linux.c | 4 -
external/mit/libdrm/dist/libkms/meson.build | 2 +-
external/mit/libdrm/dist/libkms/nouveau.c | 4 -
external/mit/libdrm/dist/libkms/radeon.c | 4 -
external/mit/libdrm/dist/libkms/vmwgfx.c | 4 -
external/mit/libdrm/dist/meson.build | 58 +-
external/mit/libdrm/dist/nouveau/Makefile.am | 2 +
external/mit/libdrm/dist/nouveau/Makefile.in | 2 +
external/mit/libdrm/dist/nouveau/abi16.c | 4 -
external/mit/libdrm/dist/nouveau/bufctx.c | 14 +-
external/mit/libdrm/dist/nouveau/meson.build | 4 +-
external/mit/libdrm/dist/nouveau/nouveau-symbol-check | 2 +
external/mit/libdrm/dist/nouveau/nouveau.c | 56 +-
external/mit/libdrm/dist/nouveau/pushbuf.c | 24 +-
external/mit/libdrm/dist/omap/Makefile.am | 2 +
external/mit/libdrm/dist/omap/Makefile.in | 2 +
external/mit/libdrm/dist/omap/meson.build | 4 +-
external/mit/libdrm/dist/omap/omap-symbol-check | 2 +
external/mit/libdrm/dist/omap/omap_drm.c | 40 +-
external/mit/libdrm/dist/radeon/Makefile.am | 2 +
external/mit/libdrm/dist/radeon/Makefile.in | 2 +
external/mit/libdrm/dist/radeon/meson.build | 4 +-
external/mit/libdrm/dist/radeon/radeon-symbol-check | 2 +
external/mit/libdrm/dist/radeon/radeon_bo.c | 31 +-
external/mit/libdrm/dist/radeon/radeon_bo_gem.c | 19 +-
external/mit/libdrm/dist/radeon/radeon_cs.c | 27 +-
external/mit/libdrm/dist/radeon/radeon_cs_gem.c | 7 +-
external/mit/libdrm/dist/radeon/radeon_cs_space.c | 11 +-
external/mit/libdrm/dist/radeon/radeon_surface.c | 11 +-
external/mit/libdrm/dist/tegra/Makefile.am | 4 +-
external/mit/libdrm/dist/tegra/Makefile.in | 4 +-
external/mit/libdrm/dist/tegra/meson.build | 4 +-
external/mit/libdrm/dist/tegra/tegra-symbol-check | 2 +
external/mit/libdrm/dist/tegra/tegra.c | 30 +-
external/mit/libdrm/dist/tests/Makefile.am | 10 +-
external/mit/libdrm/dist/tests/Makefile.in | 98 +-
external/mit/libdrm/dist/tests/amdgpu/Makefile.am | 1 +
external/mit/libdrm/dist/tests/amdgpu/Makefile.in | 1 +
external/mit/libdrm/dist/tests/amdgpu/amdgpu_test.c | 4 -
external/mit/libdrm/dist/tests/amdgpu/amdgpu_test.h | 112 +-
external/mit/libdrm/dist/tests/amdgpu/basic_tests.c | 65 +-
external/mit/libdrm/dist/tests/amdgpu/bo_tests.c | 58 +-
external/mit/libdrm/dist/tests/amdgpu/cs_tests.c | 4 -
external/mit/libdrm/dist/tests/amdgpu/deadlock_tests.c | 16 +-
external/mit/libdrm/dist/tests/amdgpu/uvd_enc_tests.c | 4 -
external/mit/libdrm/dist/tests/amdgpu/vce_ib.h | 17 +
external/mit/libdrm/dist/tests/amdgpu/vce_tests.c | 225 +++-
external/mit/libdrm/dist/tests/amdgpu/vcn_tests.c | 4 -
external/mit/libdrm/dist/tests/amdgpu/vm_tests.c | 49 +-
external/mit/libdrm/dist/tests/drmdevice.c | 82 +-
external/mit/libdrm/dist/tests/etnaviv/Makefile.am | 1 +
external/mit/libdrm/dist/tests/etnaviv/Makefile.in | 1 +
external/mit/libdrm/dist/tests/etnaviv/etnaviv_2d_test.c | 4 -
external/mit/libdrm/dist/tests/etnaviv/etnaviv_bo_cache_test.c | 4 -
external/mit/libdrm/dist/tests/exynos/Makefile.am | 1 +
external/mit/libdrm/dist/tests/exynos/Makefile.in | 1 +
external/mit/libdrm/dist/tests/exynos/exynos_fimg2d_perf.c | 7 -
external/mit/libdrm/dist/tests/exynos/exynos_fimg2d_test.c | 4 -
external/mit/libdrm/dist/tests/exynos/meson.build | 6 +-
external/mit/libdrm/dist/tests/kms/Makefile.am | 3 +-
external/mit/libdrm/dist/tests/kms/Makefile.in | 3 +-
external/mit/libdrm/dist/tests/kms/kms-steal-crtc.c | 4 -
external/mit/libdrm/dist/tests/kms/kms-universal-planes.c | 4 -
external/mit/libdrm/dist/tests/kms/libkms-test-crtc.c | 4 -
external/mit/libdrm/dist/tests/kms/libkms-test-device.c | 13 +-
external/mit/libdrm/dist/tests/kms/libkms-test-framebuffer.c | 4 -
external/mit/libdrm/dist/tests/kms/libkms-test-plane.c | 4 -
external/mit/libdrm/dist/tests/kms/libkms-test-screen.c | 4 -
external/mit/libdrm/dist/tests/kms/meson.build | 2 +-
external/mit/libdrm/dist/tests/kmstest/Makefile.am | 1 +
external/mit/libdrm/dist/tests/kmstest/Makefile.in | 1 +
external/mit/libdrm/dist/tests/kmstest/meson.build | 2 +-
external/mit/libdrm/dist/tests/meson.build | 8 +-
external/mit/libdrm/dist/tests/modeprint/Makefile.am | 2 +
external/mit/libdrm/dist/tests/modeprint/Makefile.in | 5 +-
external/mit/libdrm/dist/tests/modeprint/meson.build | 4 +-
external/mit/libdrm/dist/tests/modeprint/modeprint.c | 51 +-
external/mit/libdrm/dist/tests/modetest/Makefile.am | 1 +
external/mit/libdrm/dist/tests/modetest/Makefile.in | 6 +-
external/mit/libdrm/dist/tests/modetest/buffers.c | 4 -
external/mit/libdrm/dist/tests/modetest/cursor.c | 4 -
external/mit/libdrm/dist/tests/modetest/meson.build | 2 +-
external/mit/libdrm/dist/tests/modetest/modetest.c | 355 ++++-
external/mit/libdrm/dist/tests/nouveau/Makefile.am | 1 +
external/mit/libdrm/dist/tests/nouveau/Makefile.in | 1 +
external/mit/libdrm/dist/tests/nouveau/meson.build | 2 +-
external/mit/libdrm/dist/tests/nouveau/threaded.c | 4 -
external/mit/libdrm/dist/tests/proptest/Makefile.am | 1 +
external/mit/libdrm/dist/tests/proptest/Makefile.in | 1 +
external/mit/libdrm/dist/tests/proptest/meson.build | 2 +-
external/mit/libdrm/dist/tests/radeon/Makefile.am | 1 +
external/mit/libdrm/dist/tests/radeon/Makefile.in | 1 +
external/mit/libdrm/dist/tests/radeon/meson.build | 2 +-
external/mit/libdrm/dist/tests/tegra/Makefile.am | 4 +-
external/mit/libdrm/dist/tests/tegra/Makefile.in | 5 +-
external/mit/libdrm/dist/tests/tegra/meson.build | 2 +-
external/mit/libdrm/dist/tests/tegra/openclose.c | 4 -
external/mit/libdrm/dist/tests/util/format.c | 4 -
external/mit/libdrm/dist/tests/util/kms.c | 6 +-
external/mit/libdrm/dist/tests/util/pattern.c | 4 -
external/mit/libdrm/dist/tests/vbltest/Makefile.am | 1 +
external/mit/libdrm/dist/tests/vbltest/Makefile.in | 1 +
external/mit/libdrm/dist/tests/vbltest/meson.build | 2 +-
external/mit/libdrm/dist/tests/vbltest/vbltest.c | 4 -
external/mit/libdrm/dist/util_math.h | 2 +-
external/mit/libdrm/dist/vc4/Makefile.am | 1 +
external/mit/libdrm/dist/vc4/Makefile.in | 1 +
external/mit/libdrm/dist/xf86atomic.h | 4 -
external/mit/libdrm/dist/xf86drm.c | 657 ++++-----
external/mit/libdrm/dist/xf86drmHash.c | 20 +-
external/mit/libdrm/dist/xf86drmMode.c | 168 +-
external/mit/libdrm/dist/xf86drmRandom.c | 9 +-
external/mit/libdrm/dist/xf86drmSL.c | 23 +-
220 files changed, 5036 insertions(+), 2257 deletions(-)
diffs (truncated from 15658 to 300 lines):
diff -r 45f7874f1e7f -r 98a3d4085850 external/mit/libdrm/dist/Makefile.am
--- a/external/mit/libdrm/dist/Makefile.am Wed Jan 09 23:50:29 2019 +0000
+++ b/external/mit/libdrm/dist/Makefile.am Thu Jan 10 08:49:52 2019 +0000
@@ -121,6 +121,7 @@
libdrm_la_CPPFLAGS = -I$(top_srcdir)/include/drm
AM_CFLAGS = \
$(WARN_CFLAGS) \
+ -fvisibility=hidden \
$(VALGRIND_CFLAGS)
libdrm_la_SOURCES = $(LIBDRM_FILES)
diff -r 45f7874f1e7f -r 98a3d4085850 external/mit/libdrm/dist/Makefile.in
--- a/external/mit/libdrm/dist/Makefile.in Wed Jan 09 23:50:29 2019 +0000
+++ b/external/mit/libdrm/dist/Makefile.in Thu Jan 10 08:49:52 2019 +0000
@@ -226,12 +226,13 @@
include/drm/drm_fourcc.h include/drm/drm_mode.h \
include/drm/drm_sarea.h include/drm/i915_drm.h \
include/drm/mach64_drm.h include/drm/mga_drm.h \
- include/drm/nouveau_drm.h include/drm/qxl_drm.h \
- include/drm/r128_drm.h include/drm/radeon_drm.h \
- include/drm/amdgpu_drm.h include/drm/savage_drm.h \
- include/drm/sis_drm.h include/drm/tegra_drm.h \
- include/drm/vc4_drm.h include/drm/via_drm.h \
- include/drm/virtgpu_drm.h include/drm/vmwgfx_drm.h
+ include/drm/msm_drm.h include/drm/nouveau_drm.h \
+ include/drm/qxl_drm.h include/drm/r128_drm.h \
+ include/drm/radeon_drm.h include/drm/amdgpu_drm.h \
+ include/drm/savage_drm.h include/drm/sis_drm.h \
+ include/drm/tegra_drm.h include/drm/vc4_drm.h \
+ include/drm/via_drm.h include/drm/virtgpu_drm.h \
+ include/drm/vmwgfx_drm.h
HEADERS = $(klibdrminclude_HEADERS) $(libdrminclude_HEADERS)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
@@ -494,6 +495,7 @@
include/drm/i915_drm.h \
include/drm/mach64_drm.h \
include/drm/mga_drm.h \
+ include/drm/msm_drm.h \
include/drm/nouveau_drm.h \
include/drm/qxl_drm.h \
include/drm/r128_drm.h \
@@ -571,6 +573,7 @@
libdrm_la_CPPFLAGS = -I$(top_srcdir)/include/drm
AM_CFLAGS = \
$(WARN_CFLAGS) \
+ -fvisibility=hidden \
$(VALGRIND_CFLAGS)
libdrm_la_SOURCES = $(LIBDRM_FILES)
diff -r 45f7874f1e7f -r 98a3d4085850 external/mit/libdrm/dist/Makefile.sources
--- a/external/mit/libdrm/dist/Makefile.sources Wed Jan 09 23:50:29 2019 +0000
+++ b/external/mit/libdrm/dist/Makefile.sources Thu Jan 10 08:49:52 2019 +0000
@@ -25,6 +25,7 @@
include/drm/i915_drm.h \
include/drm/mach64_drm.h \
include/drm/mga_drm.h \
+ include/drm/msm_drm.h \
include/drm/nouveau_drm.h \
include/drm/qxl_drm.h \
include/drm/r128_drm.h \
diff -r 45f7874f1e7f -r 98a3d4085850 external/mit/libdrm/dist/amdgpu/Makefile.am
--- a/external/mit/libdrm/dist/amdgpu/Makefile.am Wed Jan 09 23:50:29 2019 +0000
+++ b/external/mit/libdrm/dist/amdgpu/Makefile.am Thu Jan 10 08:49:52 2019 +0000
@@ -26,6 +26,7 @@
AM_CFLAGS = \
$(WARN_CFLAGS) \
+ -fvisibility=hidden \
-I$(top_srcdir) \
$(PTHREADSTUBS_CFLAGS) \
-I$(top_srcdir)/include/drm
@@ -47,5 +48,6 @@
pkgconfigdir = @pkgconfigdir@
pkgconfig_DATA = libdrm_amdgpu.pc
+AM_TESTS_ENVIRONMENT = NM='$(NM)'
TESTS = amdgpu-symbol-check
EXTRA_DIST = $(TESTS)
diff -r 45f7874f1e7f -r 98a3d4085850 external/mit/libdrm/dist/amdgpu/Makefile.in
--- a/external/mit/libdrm/dist/amdgpu/Makefile.in Wed Jan 09 23:50:29 2019 +0000
+++ b/external/mit/libdrm/dist/amdgpu/Makefile.in Thu Jan 10 08:49:52 2019 +0000
@@ -162,7 +162,7 @@
libdrm_amdgpu_la_DEPENDENCIES = ../libdrm.la
am__objects_1 = amdgpu_asic_id.lo amdgpu_bo.lo amdgpu_cs.lo \
amdgpu_device.lo amdgpu_gpu_info.lo amdgpu_vamgr.lo \
- amdgpu_vm.lo util_hash.lo util_hash_table.lo
+ amdgpu_vm.lo handle_table.lo
am_libdrm_amdgpu_la_OBJECTS = $(am__objects_1)
libdrm_amdgpu_la_OBJECTS = $(am_libdrm_amdgpu_la_OBJECTS)
AM_V_lt = $(am__v_lt_@AM_V@)
@@ -575,16 +575,15 @@
amdgpu_internal.h \
amdgpu_vamgr.c \
amdgpu_vm.c \
- util_hash.c \
- util_hash.h \
- util_hash_table.c \
- util_hash_table.h
+ handle_table.c \
+ handle_table.h
LIBDRM_AMDGPU_H_FILES := \
amdgpu.h
AM_CFLAGS = \
$(WARN_CFLAGS) \
+ -fvisibility=hidden \
-I$(top_srcdir) \
$(PTHREADSTUBS_CFLAGS) \
-I$(top_srcdir)/include/drm
@@ -598,6 +597,7 @@
libdrm_amdgpuincludedir = ${includedir}/libdrm
libdrm_amdgpuinclude_HEADERS = $(LIBDRM_AMDGPU_H_FILES)
pkgconfig_DATA = libdrm_amdgpu.pc
+AM_TESTS_ENVIRONMENT = NM='$(NM)'
TESTS = amdgpu-symbol-check
EXTRA_DIST = $(TESTS)
all: all-am
@@ -688,8 +688,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amdgpu_gpu_info.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amdgpu_vamgr.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amdgpu_vm.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util_hash.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util_hash_table.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/handle_table.Plo@am__quote@
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
diff -r 45f7874f1e7f -r 98a3d4085850 external/mit/libdrm/dist/amdgpu/Makefile.sources
--- a/external/mit/libdrm/dist/amdgpu/Makefile.sources Wed Jan 09 23:50:29 2019 +0000
+++ b/external/mit/libdrm/dist/amdgpu/Makefile.sources Thu Jan 10 08:49:52 2019 +0000
@@ -7,10 +7,8 @@
amdgpu_internal.h \
amdgpu_vamgr.c \
amdgpu_vm.c \
- util_hash.c \
- util_hash.h \
- util_hash_table.c \
- util_hash_table.h
+ handle_table.c \
+ handle_table.h
LIBDRM_AMDGPU_H_FILES := \
amdgpu.h
diff -r 45f7874f1e7f -r 98a3d4085850 external/mit/libdrm/dist/amdgpu/amdgpu-symbol-check
--- a/external/mit/libdrm/dist/amdgpu/amdgpu-symbol-check Wed Jan 09 23:50:29 2019 +0000
+++ b/external/mit/libdrm/dist/amdgpu/amdgpu-symbol-check Thu Jan 10 08:49:52 2019 +0000
@@ -1,5 +1,7 @@
#!/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.am/libdrm_amdgpuinclude_HEADERS
@@ -16,6 +18,7 @@
amdgpu_bo_export
amdgpu_bo_free
amdgpu_bo_import
+amdgpu_bo_inc_ref
amdgpu_bo_list_create
amdgpu_bo_list_destroy
amdgpu_bo_list_update
@@ -53,6 +56,7 @@
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
diff -r 45f7874f1e7f -r 98a3d4085850 external/mit/libdrm/dist/amdgpu/amdgpu.h
--- a/external/mit/libdrm/dist/amdgpu/amdgpu.h Wed Jan 09 23:50:29 2019 +0000
+++ b/external/mit/libdrm/dist/amdgpu/amdgpu.h Thu Jan 10 08:49:52 2019 +0000
@@ -84,7 +84,12 @@
amdgpu_bo_handle_type_kms = 1,
/** DMA-buf fd handle */
- amdgpu_bo_handle_type_dma_buf_fd = 2
+ amdgpu_bo_handle_type_dma_buf_fd = 2,
+
+ /** KMS handle, but re-importing as a DMABUF handle through
+ * drmPrimeHandleToFD is forbidden. (Glamor does that)
+ */
+ amdgpu_bo_handle_type_kms_noimport = 3,
};
/** Define known types of GPU VM VA ranges */
@@ -673,6 +678,29 @@
amdgpu_bo_handle *buf_handle);
/**
+ * Validate if the user memory comes from BO
+ *
+ * \param dev - [in] Device handle. See #amdgpu_device_initialize()
+ * \param cpu - [in] CPU address of user allocated memory which we
+ * want to map to GPU address space (make GPU accessible)
+ * (This address must be correctly aligned).
+ * \param size - [in] Size of allocation (must be correctly aligned)
+ * \param buf_handle - [out] Buffer handle for the userptr memory
+ * if the user memory is not from BO, the buf_handle will be NULL.
+ * \param offset_in_bo - [out] offset in this BO for this user memory
+ *
+ *
+ * \return 0 on success\n
+ * <0 - Negative POSIX Error code
+ *
+*/
+int amdgpu_find_bo_by_cpu_mapping(amdgpu_device_handle dev,
+ void *cpu,
+ uint64_t size,
+ amdgpu_bo_handle *buf_handle,
+ uint64_t *offset_in_bo);
+
+/**
* Free previosuly allocated memory
*
* \param dev - \c [in] Device handle. See #amdgpu_device_initialize()
@@ -693,7 +721,17 @@
int amdgpu_bo_free(amdgpu_bo_handle buf_handle);
/**
- * Request CPU access to GPU accessible memory
+ * Increase the reference count of a buffer object
+ *
+ * \param bo - \c [in] Buffer object handle to increase the reference count
+ *
+ * \sa amdgpu_bo_alloc(), amdgpu_bo_free()
+ *
+*/
+void amdgpu_bo_inc_ref(amdgpu_bo_handle bo);
+
+/**
+ * Request CPU access to GPU accessable memory
*
* \param buf_handle - \c [in] Buffer handle
* \param cpu - \c [out] CPU address to be used for access
diff -r 45f7874f1e7f -r 98a3d4085850 external/mit/libdrm/dist/amdgpu/amdgpu_asic_id.c
--- a/external/mit/libdrm/dist/amdgpu/amdgpu_asic_id.c Wed Jan 09 23:50:29 2019 +0000
+++ b/external/mit/libdrm/dist/amdgpu/amdgpu_asic_id.c Thu Jan 10 08:49:52 2019 +0000
@@ -22,10 +22,6 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
diff -r 45f7874f1e7f -r 98a3d4085850 external/mit/libdrm/dist/amdgpu/amdgpu_bo.c
--- a/external/mit/libdrm/dist/amdgpu/amdgpu_bo.c Wed Jan 09 23:50:29 2019 +0000
+++ b/external/mit/libdrm/dist/amdgpu/amdgpu_bo.c Thu Jan 10 08:49:52 2019 +0000
@@ -22,10 +22,6 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
#include <stdlib.h>
#include <stdio.h>
#include <stdint.h>
@@ -41,7 +37,6 @@
#include "xf86drm.h"
#include "amdgpu_drm.h"
#include "amdgpu_internal.h"
-#include "util_hash_table.h"
#include "util_math.h"
static void amdgpu_close_kms_handle(amdgpu_device_handle dev,
@@ -53,18 +48,12 @@
drmIoctl(dev->fd, DRM_IOCTL_GEM_CLOSE, &args);
}
-int amdgpu_bo_alloc(amdgpu_device_handle dev,
- struct amdgpu_bo_alloc_request *alloc_buffer,
- amdgpu_bo_handle *buf_handle)
+static int amdgpu_bo_create(amdgpu_device_handle dev,
+ uint64_t size,
+ uint32_t handle,
+ amdgpu_bo_handle *buf_handle)
{
struct amdgpu_bo *bo;
- union drm_amdgpu_gem_create args;
- unsigned heap = alloc_buffer->preferred_heap;
- int r = 0;
-
- /* It's an error if the heap is not specified */
- if (!(heap & (AMDGPU_GEM_DOMAIN_GTT | AMDGPU_GEM_DOMAIN_VRAM)))
- return -EINVAL;
bo = calloc(1, sizeof(struct amdgpu_bo));
if (!bo)
@@ -72,34 +61,54 @@
atomic_set(&bo->refcount, 1);
Home |
Main Index |
Thread Index |
Old Index