.gitignore | 15 Android.mk | 43 CleanSpec.mk | 1 Makefile.am | 35 Makefile.sources | 14 README | 2 RELEASING | 39 amdgpu/Android.mk | 18 amdgpu/Makefile.am | 47 amdgpu/Makefile.sources | 15 amdgpu/amdgpu-symbol-check | 56 amdgpu/amdgpu.h | 1258 +++++++++++++++++++ amdgpu/amdgpu_asic_id.h | 165 ++ amdgpu/amdgpu_bo.c | 705 +++++++++++ amdgpu/amdgpu_cs.c | 544 ++++++++ amdgpu/amdgpu_device.c | 320 +++++ amdgpu/amdgpu_gpu_info.c | 316 ++++ amdgpu/amdgpu_internal.h | 204 +++ amdgpu/amdgpu_vamgr.c | 287 ++++ amdgpu/libdrm_amdgpu.pc.in | 11 amdgpu/util_hash.c | 387 ++++++ amdgpu/util_hash.h | 107 + amdgpu/util_hash_table.c | 262 ++++ amdgpu/util_hash_table.h | 73 + configure.ac | 160 ++ debian/changelog | 171 ++ debian/compat | 2 debian/control | 170 -- debian/copyright | 2 debian/libdrm-amdgpu1.install | 1 debian/libdrm-amdgpu1.symbols | 40 debian/libdrm-etnaviv1.install | 1 debian/libdrm-etnaviv1.symbols | 31 debian/libdrm-exynos1.symbols | 3 debian/libdrm-freedreno1.symbols | 8 debian/libdrm-intel1.symbols | 8 debian/libdrm-nouveau2.symbols | 8 debian/libdrm2.symbols | 19 debian/patches/01_default_perms.diff | 12 debian/rules | 74 - debian/source/local-options | 14 debian/upstream/signing-key.asc | 600 +++++++++ debian/watch | 3 etnaviv/Android.mk | 18 etnaviv/Makefile.am | 26 etnaviv/Makefile.sources | 12 etnaviv/etnaviv-symbol-check | 48 etnaviv/etnaviv_bo.c | 347 +++++ etnaviv/etnaviv_bo_cache.c | 196 +++ etnaviv/etnaviv_cmd_stream.c | 243 +++ etnaviv/etnaviv_device.c | 119 + etnaviv/etnaviv_drm.h | 233 +++ etnaviv/etnaviv_drmif.h | 191 +++ etnaviv/etnaviv_gpu.c | 175 ++ etnaviv/etnaviv_pipe.c | 83 + etnaviv/etnaviv_priv.h | 201 +++ etnaviv/libdrm_etnaviv.pc.in | 11 exynos/Makefile.am | 5 exynos/exynos-symbol-check | 40 exynos/exynos_drm.c | 104 + exynos/exynos_drm.h | 12 exynos/exynos_drmif.h | 26 exynos/exynos_fimg2d.c | 589 ++++++--- exynos/exynos_fimg2d.h | 18 exynos/libdrm_exynos.pc.in | 2 freedreno/Android.mk | 13 freedreno/Makefile.am | 10 freedreno/Makefile.sources | 4 freedreno/README | 16 freedreno/freedreno-symbol-check | 60 freedreno/freedreno_bo.c | 226 --- freedreno/freedreno_bo_cache.c | 222 +++ freedreno/freedreno_device.c | 77 - freedreno/freedreno_drmif.h | 21 freedreno/freedreno_pipe.c | 20 freedreno/freedreno_priv.h | 57 freedreno/freedreno_ringbuffer.c | 95 + freedreno/freedreno_ringbuffer.h | 29 freedreno/kgsl/README | 26 freedreno/kgsl/kgsl_bo.c | 21 freedreno/kgsl/kgsl_device.c | 4 freedreno/kgsl/kgsl_drm.h | 2 freedreno/kgsl/kgsl_pipe.c | 34 freedreno/kgsl/kgsl_priv.h | 33 freedreno/kgsl/kgsl_ringbuffer.c | 23 freedreno/kgsl/msm_kgsl.h | 4 freedreno/list.h | 137 -- freedreno/msm/msm_bo.c | 32 freedreno/msm/msm_device.c | 7 freedreno/msm/msm_drm.h | 131 +- freedreno/msm/msm_pipe.c | 57 freedreno/msm/msm_priv.h | 27 freedreno/msm/msm_ringbuffer.c | 515 ++++++-- include/drm/README | 157 ++ include/drm/amdgpu_drm.h | 657 ++++++++++ include/drm/drm.h | 90 + include/drm/drm_fourcc.h | 108 + include/drm/drm_mode.h | 259 +++- include/drm/drm_sarea.h | 2 include/drm/i915_drm.h | 140 +- include/drm/nouveau_drm.h | 2 include/drm/radeon_drm.h | 51 include/drm/tegra_drm.h | 3 include/drm/vc4_drm.h | 302 ++++ include/drm/virtgpu_drm.h | 174 ++ include/drm/vmwgfx_drm.h | 792 ++++++++++-- intel/Android.mk | 14 intel/Makefile.am | 9 intel/Makefile.sources | 3 intel/intel-symbol-check | 96 + intel/intel_bufmgr.c | 82 - intel/intel_bufmgr.h | 19 intel/intel_bufmgr_fake.c | 46 intel/intel_bufmgr_gem.c | 1349 +++++++++++---------- intel/intel_bufmgr_priv.h | 21 intel/intel_chipset.h | 147 +- intel/intel_decode.c | 26 intel/mm.c | 29 intel/mm.h | 36 intel/test_decode.c | 4 intel/tests/gen5-3d.batch-ref.txt | 2 intel/tests/gen6-3d.batch-ref.txt | 2 intel/uthash.h | 1074 ++++++++++++++++ libdrm.h | 89 - libdrm_macros.h | 87 + libkms/Android.mk | 10 libkms/Makefile.am | 3 libkms/api.c | 3 libkms/dumb.c | 4 libkms/exynos.c | 4 libkms/intel.c | 4 libkms/internal.h | 19 libkms/kms-symbol-check | 25 libkms/libkms.h | 4 libkms/libkms.pc.in | 1 libkms/linux.c | 13 libkms/nouveau.c | 4 libkms/radeon.c | 4 libkms/vmwgfx.c | 4 libsync.h | 148 ++ man/Makefile.am | 79 - man/drm-kms.xml | 2 nouveau/Android.mk | 13 nouveau/Makefile.am | 16 nouveau/abi16.c | 182 ++ nouveau/bufctx.c | 10 nouveau/libdrm_nouveau.pc.in | 2 nouveau/nouveau-symbol-check | 58 nouveau/nouveau.c | 629 +++++++-- nouveau/nouveau.h | 211 ++- nouveau/nvif/cl0080.h | 45 nouveau/nvif/cl9097.h | 44 nouveau/nvif/class.h | 141 ++ nouveau/nvif/if0002.h | 38 nouveau/nvif/if0003.h | 33 nouveau/nvif/ioctl.h | 132 ++ nouveau/nvif/unpack.h | 28 nouveau/private.h | 18 nouveau/pushbuf.c | 31 omap/Makefile.am | 5 omap/omap-symbol-check | 35 omap/omap_drm.c | 43 radeon/Android.mk | 13 radeon/Makefile.am | 5 radeon/Makefile.sources | 8 radeon/libdrm_radeon.pc.in | 1 radeon/r600_pci_ids.h | 2 radeon/radeon-symbol-check | 61 radeon/radeon_bo.c | 30 radeon/radeon_bo_gem.c | 43 radeon/radeon_bo_int.h | 2 radeon/radeon_cs.c | 26 radeon/radeon_cs_gem.c | 43 radeon/radeon_cs_int.h | 2 radeon/radeon_cs_space.c | 10 radeon/radeon_surface.c | 47 tegra/Makefile.am | 4 tegra/private.h | 2 tegra/tegra-symbol-check | 30 tegra/tegra.c | 13 tests/Android.mk | 1 tests/Makefile.am | 25 tests/amdgpu/Makefile.am | 29 tests/amdgpu/amdgpu_test.c | 243 +++ tests/amdgpu/amdgpu_test.h | 236 +++ tests/amdgpu/basic_tests.c | 1205 +++++++++++++++++++ tests/amdgpu/bo_tests.c | 186 ++ tests/amdgpu/cs_tests.c | 431 ++++++ tests/amdgpu/frame.h | 1949 ++++++++++++++++++++++++++++++ tests/amdgpu/uvd_messages.h | 813 ++++++++++++ tests/amdgpu/vce_ib.h | 318 +++++ tests/amdgpu/vce_tests.c | 497 +++++++ tests/drmdevice.c | 117 + tests/drmsl.c | 172 ++ tests/drmstat.c | 20 tests/etnaviv/Makefile.am | 41 tests/etnaviv/cmdstream.xml.h | 242 +++ tests/etnaviv/etnaviv_2d_test.c | 240 +++ tests/etnaviv/etnaviv_bo_cache_test.c | 121 + tests/etnaviv/etnaviv_cmd_stream_test.c | 123 + tests/etnaviv/state.xml.h | 375 +++++ tests/etnaviv/state_2d.xml.h | 1497 +++++++++++++++++++++++ tests/etnaviv/write_bmp.c | 151 ++ tests/etnaviv/write_bmp.h | 34 tests/exynos/Makefile.am | 26 tests/exynos/exynos_fimg2d_event.c | 326 +++++ tests/exynos/exynos_fimg2d_perf.c | 327 +++++ tests/exynos/exynos_fimg2d_test.c | 248 ++- tests/hash.c | 217 +++ tests/kms/Makefile.am | 36 tests/kms/kms-steal-crtc.c | 165 ++ tests/kms/kms-universal-planes.c | 361 +++++ tests/kms/libkms-test-crtc.c | 47 tests/kms/libkms-test-device.c | 218 +++ tests/kms/libkms-test-framebuffer.c | 157 ++ tests/kms/libkms-test-plane.c | 139 ++ tests/kms/libkms-test-screen.c | 92 + tests/kms/libkms-test.h | 120 + tests/kmstest/Makefile.am | 6 tests/kmstest/main.c | 42 tests/modeprint/Makefile.am | 1 tests/modeprint/modeprint.c | 24 tests/modetest/Android.mk | 5 tests/modetest/Makefile.am | 10 tests/modetest/buffers.c | 967 --------------- tests/modetest/buffers.h | 12 tests/modetest/cursor.c | 14 tests/modetest/modetest.c | 328 ++--- tests/name_from_fd.c | 2 tests/proptest/Android.mk | 13 tests/proptest/Makefile.am | 15 tests/proptest/Makefile.sources | 2 tests/proptest/proptest.c | 106 - tests/radeon/Makefile.am | 1 tests/radeon/list.h | 137 -- tests/radeon/rbo.h | 2 tests/random.c | 120 + tests/util/Android.mk | 39 tests/util/Makefile.am | 13 tests/util/Makefile.sources | 8 tests/util/common.h | 33 tests/util/format.c | 120 + tests/util/format.h | 65 + tests/util/kms.c | 182 ++ tests/util/kms.h | 35 tests/util/pattern.c | 870 +++++++++++++ tests/util/pattern.h | 39 tests/vbltest/Makefile.am | 4 tests/vbltest/vbltest.c | 61 util_double_list.h | 143 ++ util_math.h | 34 vc4/Makefile.am | 34 vc4/Makefile.sources | 3 vc4/libdrm_vc4.pc.in | 9 vc4/vc4_packet.h | 397 ++++++ vc4/vc4_qpu_defines.h | 274 ++++ xf86atomic.h | 2 xf86drm.c | 2026 ++++++++++++++++++++------------ xf86drm.h | 53 xf86drmHash.c | 205 --- xf86drmHash.h | 47 xf86drmMode.c | 415 ++++++ xf86drmMode.h | 57 xf86drmRandom.c | 79 - xf86drmRandom.h | 35 xf86drmSL.c | 179 -- 266 files changed, 32348 insertions(+), 5577 deletions(-)
New commits: commit 9d1cf83ec91acc5d1031c6dcd465a2f845f60dcc Author: Andreas Boll <andreas.boll....@gmail.com> Date: Fri Jan 27 15:19:18 2017 +0100 Enable building etnaviv on armhf (Closes: #852685). diff --git a/debian/changelog b/debian/changelog index c47a495..d807bf6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ libdrm (2.4.74-2) UNRELEASED; urgency=medium * Switch to dbgsym packages. + * Enable building etnaviv on armhf (Closes: #852685). -- Andreas Boll <andreas.boll....@gmail.com> Fri, 27 Jan 2017 15:15:41 +0100 diff --git a/debian/control b/debian/control index a528959..28a1788 100644 --- a/debian/control +++ b/debian/control @@ -34,6 +34,7 @@ Depends: libdrm-freedreno1 (= ${binary:Version}) [any-arm arm64], libdrm-exynos1 (= ${binary:Version}) [any-arm], libdrm-tegra0 (= ${binary:Version}) [any-arm arm64], + libdrm-etnaviv1 (= ${binary:Version}) [armhf], ${misc:Depends}, Multi-Arch: same Description: Userspace interface to kernel DRM services -- development files @@ -181,3 +182,17 @@ Description: Userspace interface to amdgpu-specific kernel DRM services -- runti kernelspace portion of the "Direct Rendering Infrastructure" (DRI). The DRI is currently used on Linux to provide hardware-accelerated OpenGL drivers. + +Package: libdrm-etnaviv1 +Architecture: armhf +Depends: + ${shlibs:Depends}, + ${misc:Depends}, +Pre-Depends: ${misc:Pre-Depends} +Multi-Arch: same +Description: Userspace interface to etnaviv-specific kernel DRM services -- runtime + This library implements the userspace interface to the kernel DRM + services. DRM stands for "Direct Rendering Manager", which is the + kernelspace portion of the "Direct Rendering Infrastructure" (DRI). + The DRI is currently used on Linux to provide hardware-accelerated + OpenGL drivers. diff --git a/debian/libdrm-etnaviv1.install b/debian/libdrm-etnaviv1.install new file mode 100644 index 0000000..020e079 --- /dev/null +++ b/debian/libdrm-etnaviv1.install @@ -0,0 +1 @@ +usr/lib/*/libdrm_etnaviv.so.1* diff --git a/debian/libdrm-etnaviv1.symbols b/debian/libdrm-etnaviv1.symbols new file mode 100644 index 0000000..b64859f --- /dev/null +++ b/debian/libdrm-etnaviv1.symbols @@ -0,0 +1,31 @@ +libdrm_etnaviv.so.1 libdrm-etnaviv1 #MINVER# + etna_bo_cpu_fini@Base 0 + etna_bo_cpu_prep@Base 0 + etna_bo_del@Base 0 + etna_bo_dmabuf@Base 0 + etna_bo_from_dmabuf@Base 0 + etna_bo_from_name@Base 0 + etna_bo_get_name@Base 0 + etna_bo_handle@Base 0 + etna_bo_map@Base 0 + etna_bo_new@Base 0 + etna_bo_ref@Base 0 + etna_bo_size@Base 0 + etna_cmd_stream_del@Base 0 + etna_cmd_stream_finish@Base 0 + etna_cmd_stream_flush@Base 0 + etna_cmd_stream_new@Base 0 + etna_cmd_stream_reloc@Base 0 + etna_cmd_stream_timestamp@Base 0 + etna_device_del@Base 0 + etna_device_fd@Base 0 + etna_device_new@Base 0 + etna_device_new_dup@Base 0 + etna_device_ref@Base 0 + etna_gpu_del@Base 0 + etna_gpu_get_param@Base 0 + etna_gpu_new@Base 0 + etna_pipe_del@Base 0 + etna_pipe_new@Base 0 + etna_pipe_wait@Base 0 + etna_pipe_wait_ns@Base 0 diff --git a/debian/rules b/debian/rules index 4ddf45b..7ba2a69 100755 --- a/debian/rules +++ b/debian/rules @@ -5,6 +5,7 @@ ### # Some variables: +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) @@ -54,6 +55,16 @@ else confflags += --disable-omap-experimental-api endif +# Etnaviv is on armhf +ifneq (,$(filter armhf,$(DEB_HOST_ARCH))) + ETNAVIV = yes +endif +ifeq ($(ETNAVIV), yes) + confflags += --enable-etnaviv-experimental-api +else + confflags += --disable-etnaviv-experimental-api +endif + # Tegra is on arm and arm64 ifneq (,$(filter arm arm64,$(DEB_HOST_ARCH_CPU))) TEGRA = yes @@ -105,6 +116,9 @@ ifeq ($(ARM), yes) dh_makeshlibs -plibdrm-omap1 -V'libdrm-omap1 (>= 2.4.38)' -- -c4 dh_makeshlibs -plibdrm-exynos1 -V'libdrm-exynos1 (>= 2.4.66)' -- -c4 endif +ifeq ($(ETNAVIV), yes) + dh_makeshlibs -plibdrm-etnaviv1 -V'libdrm-etnaviv1' -- -c4 +endif ifeq ($(TEGRA), yes) dh_makeshlibs -plibdrm-tegra0 -V'libdrm-tegra0' -- -c4 endif commit 91be4a93d098340f538e1163b7aec782b5d1d167 Author: Andreas Boll <andreas.boll....@gmail.com> Date: Fri Jan 27 15:16:05 2017 +0100 Switch to dbgsym packages. diff --git a/debian/changelog b/debian/changelog index b7897da..c47a495 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libdrm (2.4.74-2) UNRELEASED; urgency=medium + + * Switch to dbgsym packages. + + -- Andreas Boll <andreas.boll....@gmail.com> Fri, 27 Jan 2017 15:15:41 +0100 + libdrm (2.4.74-1) unstable; urgency=medium * New upstream release. diff --git a/debian/control b/debian/control index e60a4aa..a528959 100644 --- a/debian/control +++ b/debian/control @@ -71,23 +71,6 @@ Depends: Description: Userspace interface to kernel DRM services -- runtime This is a udeb, or a microdeb, for the debian-installer. -Package: libdrm2-dbg -Section: debug -Priority: extra -Architecture: linux-any kfreebsd-any -Depends: - libdrm2 (= ${binary:Version}), - ${misc:Depends}, -Multi-Arch: same -Description: Userspace interface to kernel DRM services -- debugging symbols - This library implements the userspace interface to the kernel DRM - services. DRM stands for "Direct Rendering Manager", which is the - kernelspace portion of the "Direct Rendering Infrastructure" (DRI). - The DRI is currently used on Linux to provide hardware-accelerated - OpenGL drivers. - . - This package provides debugging symbols for the libdrm2 package. - Package: libdrm-intel1 Architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386 x32 Depends: @@ -102,23 +85,6 @@ Description: Userspace interface to intel-specific kernel DRM services -- runtim The DRI is currently used on Linux to provide hardware-accelerated OpenGL drivers. -Package: libdrm-intel1-dbg -Section: debug -Priority: extra -Architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386 x32 -Depends: - libdrm-intel1 (= ${binary:Version}), - ${misc:Depends}, -Multi-Arch: same -Description: Userspace interface to intel-specific kernel DRM services -- debugging symbols - This library implements the userspace interface to the kernel DRM - services. DRM stands for "Direct Rendering Manager", which is the - kernelspace portion of the "Direct Rendering Infrastructure" (DRI). - The DRI is currently used on Linux to provide hardware-accelerated - OpenGL drivers. - . - This package provides the debugging symbols for the libdrm-intel1 package. - Package: libdrm-nouveau2 Architecture: linux-any Depends: ${shlibs:Depends}, @@ -132,22 +98,6 @@ Description: Userspace interface to nouveau-specific kernel DRM services -- runt The DRI is currently used on Linux to provide hardware-accelerated OpenGL drivers. -Package: libdrm-nouveau2-dbg -Section: debug -Priority: extra -Architecture: linux-any -Depends: libdrm-nouveau2 (= ${binary:Version}), - ${misc:Depends}, -Multi-Arch: same -Description: Userspace interface to nouveau-specific kernel DRM -- debugging symbols - This library implements the userspace interface to the kernel DRM - services. DRM stands for "Direct Rendering Manager", which is the - kernelspace portion of the "Direct Rendering Infrastructure" (DRI). - The DRI is currently used on Linux to provide hardware-accelerated - OpenGL drivers. - . - This package provides the debugging symbols for the libdrm-nouveau2 package. - Package: libdrm-radeon1 Architecture: linux-any kfreebsd-any Depends: @@ -162,23 +112,6 @@ Description: Userspace interface to radeon-specific kernel DRM services -- runti The DRI is currently used on Linux to provide hardware-accelerated OpenGL drivers. -Package: libdrm-radeon1-dbg -Section: debug -Priority: extra -Architecture: linux-any kfreebsd-any -Depends: - libdrm-radeon1 (= ${binary:Version}), - ${misc:Depends}, -Multi-Arch: same -Description: Userspace interface to radeon-specific kernel DRM services -- debugging symbols - This library implements the userspace interface to the kernel DRM - services. DRM stands for "Direct Rendering Manager", which is the - kernelspace portion of the "Direct Rendering Infrastructure" (DRI). - The DRI is currently used on Linux to provide hardware-accelerated - OpenGL drivers. - . - This package provides the debugging symbols for the libdrm-radeon1 package. - Package: libdrm-omap1 Architecture: any-arm Depends: @@ -193,23 +126,6 @@ Description: Userspace interface to omap-specific kernel DRM services -- runtime The DRI is currently used on Linux to provide hardware-accelerated OpenGL drivers. -Package: libdrm-omap1-dbg -Section: debug -Priority: extra -Architecture: any-arm -Depends: - libdrm-omap1 (= ${binary:Version}), - ${misc:Depends}, -Multi-Arch: same -Description: Userspace interface to omap-specific kernel DRM services -- debugging symbols - This library implements the userspace interface to the kernel DRM - services. DRM stands for "Direct Rendering Manager", which is the - kernelspace portion of the "Direct Rendering Infrastructure" (DRI). - The DRI is currently used on Linux to provide hardware-accelerated - OpenGL drivers. - . - This package provides the debugging symbols for the libdrm-omap1 package. - Package: libdrm-freedreno1 Architecture: any-arm arm64 Depends: @@ -224,23 +140,6 @@ Description: Userspace interface to msm/kgsl kernel DRM services -- runtime The DRI is currently used on Linux to provide hardware-accelerated OpenGL drivers. -Package: libdrm-freedreno1-dbg -Section: debug -Priority: extra -Architecture: any-arm arm64 -Depends: - libdrm-freedreno1 (= ${binary:Version}), - ${misc:Depends}, -Multi-Arch: same -Description: Userspace interface to msm/kgsl kernel DRM services -- debugging symbols - This library implements the userspace interface to the kernel DRM - services. DRM stands for "Direct Rendering Manager", which is the - kernelspace portion of the "Direct Rendering Infrastructure" (DRI). - The DRI is currently used on Linux to provide hardware-accelerated - OpenGL drivers. - . - This package provides the debugging symbols for the libdrm-freedreno1 package. - Package: libdrm-exynos1 Architecture: any-arm Depends: @@ -255,23 +154,6 @@ Description: Userspace interface to exynos-specific kernel DRM services -- runti The DRI is currently used on Linux to provide hardware-accelerated OpenGL drivers. -Package: libdrm-exynos1-dbg -Section: debug -Priority: extra -Architecture: any-arm -Depends: - libdrm-exynos1 (= ${binary:Version}), - ${misc:Depends}, -Multi-Arch: same -Description: Userspace interface to exynos-specific kernel DRM services -- debugging symbols - This library implements the userspace interface to the kernel DRM - services. DRM stands for "Direct Rendering Manager", which is the - kernelspace portion of the "Direct Rendering Infrastructure" (DRI). - The DRI is currently used on Linux to provide hardware-accelerated - OpenGL drivers. - . - This package provides the debugging symbols for the libdrm-exynos1 package. - Package: libdrm-tegra0 Architecture: any-arm arm64 Depends: @@ -286,23 +168,6 @@ Description: Userspace interface to tegra-specific kernel DRM services -- runtim The DRI is currently used on Linux to provide hardware-accelerated OpenGL drivers. -Package: libdrm-tegra0-dbg -Section: debug -Priority: extra -Architecture: any-arm arm64 -Depends: - libdrm-tegra0 (= ${binary:Version}), - ${misc:Depends}, -Multi-Arch: same -Description: Userspace interface to tegra-specific kernel DRM services -- debugging symbols - This library implements the userspace interface to the kernel DRM - services. DRM stands for "Direct Rendering Manager", which is the - kernelspace portion of the "Direct Rendering Infrastructure" (DRI). - The DRI is currently used on Linux to provide hardware-accelerated - OpenGL drivers. - . - This package provides the debugging symbols for the libdrm-tegra0 package. - Package: libdrm-amdgpu1 Architecture: linux-any kfreebsd-any Depends: @@ -316,20 +181,3 @@ Description: Userspace interface to amdgpu-specific kernel DRM services -- runti kernelspace portion of the "Direct Rendering Infrastructure" (DRI). The DRI is currently used on Linux to provide hardware-accelerated OpenGL drivers. - -Package: libdrm-amdgpu1-dbg -Section: debug -Priority: extra -Architecture: linux-any kfreebsd-any -Depends: - libdrm-amdgpu1 (= ${binary:Version}), - ${misc:Depends}, -Multi-Arch: same -Description: Userspace interface to amdgpu-specific kernel DRM services -- debugging symbols - This library implements the userspace interface to the kernel DRM - services. DRM stands for "Direct Rendering Manager", which is the - kernelspace portion of the "Direct Rendering Infrastructure" (DRI). - The DRI is currently used on Linux to provide hardware-accelerated - OpenGL drivers. - . - This package provides the debugging symbols for the libdrm-amdgpu1 package. diff --git a/debian/rules b/debian/rules index 34abe72..4ddf45b 100755 --- a/debian/rules +++ b/debian/rules @@ -91,28 +91,6 @@ override_dh_install: find debian/tmp -name '*.la' -delete dh_install --fail-missing -override_dh_strip: - dh_strip -plibdrm2 --dbg-package=libdrm2-dbg -ifeq ($(INTEL), yes) - dh_strip -plibdrm-intel1 --dbg-package=libdrm-intel1-dbg -endif -ifeq ($(NOUVEAU), yes) - dh_strip -plibdrm-nouveau2 --dbg-package=libdrm-nouveau2-dbg -endif - dh_strip -plibdrm-radeon1 --dbg-package=libdrm-radeon1-dbg - dh_strip -plibdrm-amdgpu1 --dbg-package=libdrm-amdgpu1-dbg -ifeq ($(ARM), yes) - dh_strip -plibdrm-omap1 --dbg-package=libdrm-omap1-dbg - dh_strip -plibdrm-exynos1 --dbg-package=libdrm-exynos1-dbg -endif -ifeq ($(TEGRA), yes) - dh_strip -plibdrm-tegra0 --dbg-package=libdrm-tegra0-dbg -endif -ifeq ($(FREEDRENO), yes) - dh_strip -plibdrm-freedreno1 --dbg-package=libdrm-freedreno1-dbg -endif - dh_strip -s --remaining-packages - override_dh_makeshlibs: dh_makeshlibs -plibdrm2 -V'libdrm2 (>= 2.4.74)' --add-udeb=libdrm2-udeb -- -c4 ifeq ($(INTEL), yes) commit a4d943024af59e7bd81847aae9097d13537378e6 Author: Andreas Boll <andreas.boll....@gmail.com> Date: Tue Nov 29 19:01:17 2016 +0100 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index 72384ad..b7897da 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libdrm (2.4.74-1) UNRELEASED; urgency=medium +libdrm (2.4.74-1) unstable; urgency=medium * New upstream release. * Update debian/upstream/signing-key.asc. @@ -6,7 +6,7 @@ libdrm (2.4.74-1) UNRELEASED; urgency=medium shlibs. * Bump debhelper compat to 10. - -- Andreas Boll <andreas.boll....@gmail.com> Tue, 29 Nov 2016 18:19:05 +0100 + -- Andreas Boll <andreas.boll....@gmail.com> Tue, 29 Nov 2016 19:01:04 +0100 libdrm (2.4.73-1) unstable; urgency=medium commit d963fbc94795e4903f9ada320540380a3e774b7b Author: Andreas Boll <andreas.boll....@gmail.com> Date: Tue Nov 29 18:52:03 2016 +0100 Bump debhelper compat to 10. diff --git a/debian/changelog b/debian/changelog index 48539d7..72384ad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ libdrm (2.4.74-1) UNRELEASED; urgency=medium * Update debian/upstream/signing-key.asc. * Bump libdrm2's, libdrm-freedreno1's and libdrm-intel1's symbols and shlibs. + * Bump debhelper compat to 10. -- Andreas Boll <andreas.boll....@gmail.com> Tue, 29 Nov 2016 18:19:05 +0100 diff --git a/debian/compat b/debian/compat index ec63514..f599e28 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/control b/debian/control index 7854824..e60a4aa 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,7 @@ Priority: optional Maintainer: Debian X Strike Force <debian-x@lists.debian.org> Uploaders: Andreas Boll <andreas.boll....@gmail.com> Build-Depends: - debhelper (>= 9), - dh-autoreconf, + debhelper (>= 10), quilt, xsltproc, docbook-xsl, diff --git a/debian/rules b/debian/rules index ebc5a9a..34abe72 100755 --- a/debian/rules +++ b/debian/rules @@ -135,4 +135,4 @@ ifeq ($(FREEDRENO), yes) endif %: - dh $@ --with quilt,autoreconf --builddirectory=build/ + dh $@ --with quilt --builddirectory=build/ commit 59f71414c0a4e45fa75bda9990c2d97cc5687519 Author: Andreas Boll <andreas.boll....@gmail.com> Date: Tue Nov 29 18:49:09 2016 +0100 Bump libdrm2's, libdrm-freedreno1's and libdrm-intel1's symbols and shlibs. diff --git a/debian/changelog b/debian/changelog index d74fb38..48539d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ libdrm (2.4.74-1) UNRELEASED; urgency=medium * New upstream release. * Update debian/upstream/signing-key.asc. + * Bump libdrm2's, libdrm-freedreno1's and libdrm-intel1's symbols and + shlibs. -- Andreas Boll <andreas.boll....@gmail.com> Tue, 29 Nov 2016 18:19:05 +0100 diff --git a/debian/libdrm-freedreno1.symbols b/debian/libdrm-freedreno1.symbols index 70b84cd..c015b50 100644 --- a/debian/libdrm-freedreno1.symbols +++ b/debian/libdrm-freedreno1.symbols @@ -32,6 +32,7 @@ libdrm_freedreno.so.1 libdrm-freedreno1 #MINVER# fd_ringbuffer_flush@Base 0 fd_ringbuffer_grow@Base 2.4.70 fd_ringbuffer_new@Base 0 + fd_ringbuffer_reloc2@Base 2.4.74 fd_ringbuffer_reloc@Base 0 fd_ringbuffer_reset@Base 0 fd_ringbuffer_set_parent@Base 0 diff --git a/debian/libdrm-intel1.symbols b/debian/libdrm-intel1.symbols index 102f799..bf64a62 100644 --- a/debian/libdrm-intel1.symbols +++ b/debian/libdrm-intel1.symbols @@ -69,6 +69,7 @@ libdrm_intel.so.1 libdrm-intel1 #MINVER# drm_intel_gem_bo_wait@Base 2.4.36 drm_intel_gem_context_create@Base 2.4.37 drm_intel_gem_context_destroy@Base 2.4.37 + drm_intel_gem_context_get_id@Base 2.4.74 drm_intel_get_aperture_sizes@Base 2.4.26 drm_intel_get_eu_total@Base 2.4.60 drm_intel_get_min_eu_in_pool@Base 2.4.71 diff --git a/debian/libdrm2.symbols b/debian/libdrm2.symbols index 1a57179..275a4e9 100644 --- a/debian/libdrm2.symbols +++ b/debian/libdrm2.symbols @@ -54,6 +54,7 @@ libdrm.so.2 libdrm2 #MINVER# drmGetContextPrivateMapping@Base 2.3.1 drmGetContextTag@Base 2.3.1 drmGetDevice@Base 2.4.66 + drmGetDeviceNameFromFd2@Base 2.4.74 drmGetDeviceNameFromFd@Base 2.4.16 drmGetDevices@Base 2.4.65 drmGetEntry@Base 2.3.1 diff --git a/debian/rules b/debian/rules index 2a7b70b..ebc5a9a 100755 --- a/debian/rules +++ b/debian/rules @@ -114,9 +114,9 @@ endif dh_strip -s --remaining-packages override_dh_makeshlibs: - dh_makeshlibs -plibdrm2 -V'libdrm2 (>= 2.4.73)' --add-udeb=libdrm2-udeb -- -c4 + dh_makeshlibs -plibdrm2 -V'libdrm2 (>= 2.4.74)' --add-udeb=libdrm2-udeb -- -c4 ifeq ($(INTEL), yes) - dh_makeshlibs -plibdrm-intel1 -V'libdrm-intel1 (>= 2.4.73)' -- -c4 + dh_makeshlibs -plibdrm-intel1 -V'libdrm-intel1 (>= 2.4.74)' -- -c4 endif ifeq ($(NOUVEAU), yes) dh_makeshlibs -plibdrm-nouveau2 -V'libdrm-nouveau2 (>= 2.4.66)' -- -c4 @@ -131,7 +131,7 @@ ifeq ($(TEGRA), yes) dh_makeshlibs -plibdrm-tegra0 -V'libdrm-tegra0' -- -c4 endif ifeq ($(FREEDRENO), yes) - dh_makeshlibs -plibdrm-freedreno1 -V'libdrm-freedreno1 (>= 2.4.73)' -- -c4 + dh_makeshlibs -plibdrm-freedreno1 -V'libdrm-freedreno1 (>= 2.4.74)' -- -c4 endif %: commit 5836305282a58989107ac7e83483e81a762a63b2 Author: Andreas Boll <andreas.boll....@gmail.com> Date: Tue Nov 29 18:19:53 2016 +0100 Update debian/upstream/signing-key.asc. diff --git a/debian/changelog b/debian/changelog index d3131eb..d74fb38 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ libdrm (2.4.74-1) UNRELEASED; urgency=medium * New upstream release. + * Update debian/upstream/signing-key.asc. -- Andreas Boll <andreas.boll....@gmail.com> Tue, 29 Nov 2016 18:19:05 +0100 diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc index 825d341..e632747 100644 --- a/debian/upstream/signing-key.asc +++ b/debian/upstream/signing-key.asc @@ -569,3 +569,32 @@ RORfs8GvAfjXb7SSmoPfSWdhV1tlAWL0+jR6beSUOnzNvD0cXGkzm3xjv1hH2oq9 iqrZxglMEU1kp5n7vQ2OKB8g+29kluBxlWkTaQ== =zFx6 -----END PGP PUBLIC KEY BLOCK----- +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQGiBEnu/8YRBADLqkTjmVAbTDVC/jhoOT4KWonJ6XA2or/E6ncsAappM5J8Mnop +B24BSSeO7g8wD4bxVdqP95daIon10q+ahYVNmBrpfM0CPtvopILDnysb0YG6YvrZ +e1edEFzEdb0x2/3gN5fIjl/5jNzlneMw+0CBD7Pw9p93LQmHGVmACUM8owCgg3J7 +NbDOO/j8/AiHQbUj9rV9nqED/3XVJ+CD8/gXKukPSv3fAMH4GLgDiYO4GXryIafp +oX3ughgLZRHc/QnaQCtvqIUOoVfMv9AKGeQjyjok6GlDm2hIlxOUjD6hH7wE+2yJ +Ysv+gc3tJWVJaDPW0JguOGAP6POYv5+hG6+kBJpdB5wD6Cc/Yk7c1i6EiogChgiO +2/xEBADLjfVOyLwlOAuFLx8W7t2BhYWzJAOEjEqhUsLBMLnfQAz2IOjlyE+0gn6i +8lLHqFZtqTUG5rszr8QNuCReN9NJAPy4vvk7xuM4KJ0APK8LAjR4oPsSkRYZfG1u +e9dJLFMIoOzZ4EduT8v0qw+83yEreaoUBI3qikEC/aPdi1v5xLQjUm9iZXJ0IEJy +YWdnIDxyb2JlcnRAc2l4YnluaW5lLm9yZz6IYAQTEQIAIAUCSe7/xgIbAwYLCQgH +AwIEFQIIAwQWAgMBAh4BAheAAAoJEIzR31UpdSl7E/oAn1j4l0ji2iVRIlGn3nZ2 +tF+rh94TAJwIUPgIubyVVTCEIk6YK0HMPdSeBLkCDQRJ7v/GEAgA9yNw33b1n6TA +AAunUiQ2txNIA0rR+Cpn0vACPDqdBVBMGzy/tlz68LVP9vlCJu1Kev44wX+K8XWc +T93TlrOuVI53YAKq4l3dajl4RQxoFLTSMOrTZwe2vlgZ2jSaT0y9BroEsCzynJnR +4VebAm0ZhB5rGsjHwOVa/KKOyRFyDCjOkmov/AWJPnjyfIwqFMEqMcA7cgS9NdGq +Omj3NsCV0q1I4c4n6qKwSeuZSpCTPueZKoiPciQh+/lhX+B+ugvc/xVKvGzFVEew +aRfdcTBUSP9aflt+lqAavuLgO334kBj6BK081xZ1T0hbUgsEIl//ToORg3MWBpEj +mp1xKgcPYwADBggAwdPSBUBoqyBlUwO7rCvKEz1AqBsOaBPY3Hg8vPOpHnaZWS2t +ipIdN9qS5KJ9664HVNpEvzcmR8LQq7EbPkURqXSYiIjucN1e+JMYm4InBagLrVoJ +S3Tp1HyGqlRZf2RTbYya0xcXyancm6LL3c8wGL+Km3uuOJF6ArSpRATTebLAY5Rc +wnY10rL26Elt5SDQd1l0uP3rRvqIdu+X5VCw3jWHPCEbmnwm6mhQtSCQWdVQ+HsU +wFJEnyYIhZwCk9kWHzNluo2BiHt8pV6chCxwYC+YJOrMn97rpVbCb0KH4YCXsxKD +tRzsltiiTnUj1X/a9GXQ4c9Cei99t8YapwBOUohJBBgRAgAJBQJJ7v/GAhsMAAoJ +EIzR31UpdSl7BfsAniKIAni1DrAS4TqxwrtBFVRcuzONAJ0RP4DQCKBzcJGXntI0 +U9e5j9NIWQ== +=+7XN +-----END PGP PUBLIC KEY BLOCK----- commit 148ff518547eea61335312c9ec4583e7e9b038cc Author: Andreas Boll <andreas.boll....@gmail.com> Date: Tue Nov 29 18:19:23 2016 +0100 Bump changelog diff --git a/debian/changelog b/debian/changelog index afe749c..d3131eb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libdrm (2.4.74-1) UNRELEASED; urgency=medium + + * New upstream release. + + -- Andreas Boll <andreas.boll....@gmail.com> Tue, 29 Nov 2016 18:19:05 +0100 + libdrm (2.4.73-1) unstable; urgency=medium * New upstream release. commit dae413e43866d36500538c2801cc66a5a89e426d Author: Robert Bragg <robert.br...@intel.com> Date: Tue Nov 29 10:42:38 2016 +0000 Bump version for release diff --git a/configure.ac b/configure.ac index 9f25a4c..708c562 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ AC_PREREQ([2.63]) AC_INIT([libdrm], - [2.4.73], + [2.4.74], [https://bugs.freedesktop.org/enter_bug.cgi?product=DRI], [libdrm]) commit a8315834a9d975efa901ba2add7f5001d645119e Author: Eric Anholt <e...@anholt.net> Date: Wed Nov 16 17:06:10 2016 -0800 vc4: Add new GETPARAMs that have been merged to drm-next. Signed-off-by: Eric Anholt <e...@anholt.net> diff --git a/include/drm/vc4_drm.h b/include/drm/vc4_drm.h index 919eece..319881d 100644 --- a/include/drm/vc4_drm.h +++ b/include/drm/vc4_drm.h @@ -286,6 +286,8 @@ struct drm_vc4_get_hang_state { #define DRM_VC4_PARAM_V3D_IDENT1 1 #define DRM_VC4_PARAM_V3D_IDENT2 2 #define DRM_VC4_PARAM_SUPPORTS_BRANCHES 3 +#define DRM_VC4_PARAM_SUPPORTS_ETC1 4 +#define DRM_VC4_PARAM_SUPPORTS_THREADED_FS 5 struct drm_vc4_get_param { __u32 param; commit 23d10b82440f59f2a685db34d3662d75f4a3784b Author: Rob Clark <robcl...@freedesktop.org> Date: Wed Nov 9 09:02:09 2016 -0500 freedreno: 64bit support a5xx and later are 64bit devices.. make reloc's handle that. A new public symbol is introduced to avoid silent problems with new mesa and old libdrm (since on 64b reloc consumes two dwords). Signed-off-by: Rob Clark <robcl...@freedesktop.org> diff --git a/freedreno/freedreno-symbol-check b/freedreno/freedreno-symbol-check index ad367fc..42f2c43 100755 --- a/freedreno/freedreno-symbol-check +++ b/freedreno/freedreno-symbol-check @@ -43,6 +43,7 @@ fd_ringbuffer_flush fd_ringbuffer_grow fd_ringbuffer_new fd_ringbuffer_reloc +fd_ringbuffer_reloc2 fd_ringbuffer_reset fd_ringbuffer_set_parent fd_ringbuffer_timestamp diff --git a/freedreno/freedreno_pipe.c b/freedreno/freedreno_pipe.c index 4a756d7..3f8c834 100644 --- a/freedreno/freedreno_pipe.c +++ b/freedreno/freedreno_pipe.c @@ -37,6 +37,7 @@ struct fd_pipe * fd_pipe_new(struct fd_device *dev, enum fd_pipe_id id) { struct fd_pipe *pipe = NULL; + uint64_t val; if (id > FD_PIPE_MAX) { ERROR_MSG("invalid pipe id: %d", id); @@ -52,6 +53,9 @@ fd_pipe_new(struct fd_device *dev, enum fd_pipe_id id) pipe->dev = dev; pipe->id = id; + fd_pipe_get_param(pipe, FD_GPU_ID, &val); + pipe->gpu_id = val; + return pipe; fail: if (pipe) diff --git a/freedreno/freedreno_priv.h b/freedreno/freedreno_priv.h index 86da83b..3217039 100644 --- a/freedreno/freedreno_priv.h +++ b/freedreno/freedreno_priv.h @@ -123,6 +123,7 @@ struct fd_pipe_funcs { struct fd_pipe { struct fd_device *dev;