diff options
author | wiz <wiz@pkgsrc.org> | 2015-12-29 23:05:09 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2015-12-29 23:05:09 +0000 |
commit | a4656eab5fe0a9b059501fc70b06d8599e67b119 (patch) | |
tree | 861e794c0be02c74ab8ff62cd254552abffdc991 /x11/libdrm | |
parent | 83b05069264b36aca4b1b8d024918d358c4667ee (diff) | |
download | pkgsrc-a4656eab5fe0a9b059501fc70b06d8599e67b119.tar.gz |
Update libdrm to 2.4.66:
libdrm 2.4.66 release, mainly for new nouveau API.
lots of other changes in here as well though.
Ben Skeggs (14):
nouveau: import and install a selection of nvif headers from the kernel
nouveau: move more abi16-specific logic into abi16.c
nouveau: move object functions up, to avoid future foward decls
nouveau: make it possible to init object in pre-allocated memory
nouveau: add interface to call an object's methods
nouveau: add interfaces to query information about supported classes
nouveau: introduce object to represent the kernel client
nouveau: stack legacy nouveau_device on top of nouveau_drm
nouveau: make use of nouveau_drm::fd instead of nouveau_device::fd
nouveau: remove nouveau_object_find()
nouveau: add new interface to create a nouveau_device
nouveau: add support for newer kernel interfaces
nouveau: clean up nouveau.h, noting deprecated members/functions
Bump version for release
Ben Widawsky (2):
intel: Add SKL GT4 PCI IDs
intel: Cleanup SKL PCI ID definitions.
Chih-Wei Huang (1):
intel: add the missing <strings.h> include
Dave Airlie (1):
drm: add virtgpu_drm.h
Emil Velikov (17):
automake: set --enable-valgrind during make distcheck
xf86drmMode: smoke-test the atomic API
tests/drmdevice: add new 'test'
xf86drm: flex platform specifics into drmParsePciBusInfo
xf86drm: move platform details to drmParsePciDeviceInfo()
xf86drm: move the final linux specific bits out of drmGetDevices
xf86drm: rename drmSameDevice to drmCompareBusInfo
util_math: add MAX3 macro
xf86drm: rework drmGetDevices()
xf86drm: move ifdef __linux__ guards where needed
xf86drm: warn on missing drmGetMinorNameForFD implementation
xf86drm: split out drmProcessPciDevice and drmFoldDuplicatedDevices
xf86drm: add drm{Get,Free}Device
tests/drmdevice: add drm{Get,Free}Device() example
Fix SunOS/NetBSD atomic macro
xf86drm: remove makedev() hack/workaround
configure.ac: test for the same atomic function as the one we use
Felix Janda (1):
xf86drm: include <limits.h> for PATH_MAX
Jammy Zhou (1):
amdgpu: fix overflow for timeout calculation
Jonathan Gray (1):
configure.ac: rework compiler builtin atomic tests
Kristian Høgsberg Kristensen (3):
intel: Update i915_drm.h
Add tests/drmdevice to .gitignore
intel: Add drm_intel_bo_set_softpin_offset to intel-symbol-check
Matt Roper (3):
xf86drm: Fix error handling for drmGetDevices()
xf86drm: Fix error handling for drmGetDevice()
xf86drm: Handle unrecognized subsystems safely in drmGetDevice[s]()
Michał Winiarski (2):
intel: Add support for softpin
intel: Restore formatting of offsets in debug statements
Michel Dänzer (2):
Fix void pointer arithmetic in drmProcessPciDevice
radeon: Handle surface offsets exceeding 32 bits correctly
Michel Thierry (2):
intel: 48b ppgtt support (EXEC_OBJECT_SUPPORTS_48B_ADDRESS flag)
intel: add drm_intel_bo_use_48b_address_range to symbol-check test
Rob Clark (3):
freedreno: don't reuse exported buffers
freedreno: drop exported dmabuf fd tracking
freedreno: debug msg cleanup
Stefan Agner (1):
tests: remove missleading comments
Thierry Reding (10):
tests: Split helpers into library
tests: Move name tables to libutil
proptest: Add Android support
tests: Add libkms-test library
tests: kms: Implement CRTC stealing test
tests: kms: Implement universal planes test
tests: Add helper to open a device/module
modetest: Use util_open()
proptest: Use util_open()
vbltest: Use util_open()
Tobias Jakobi (18):
exynos/fimg2d: fix empty buffer handling in g2d_flush()
exynos/fimg2d: simplify base address submission in g2d_scale_and_blend()
exynos/fimg2d: add g2d_check_space()
exynos/fimg2d: add g2d_validate_xyz() functions
exynos/fimg2d: remove default case from g2d_get_blend_op()
exynos/fimg2d: remove superfluous initialization of g2d_point_val
exynos/fimg2d: make g2d_add_cmd() less heavy
exynos/fimg2d: add message prefix
exynos/fimg2d: remove g2d_context from public header
exynos: Introduce exynos_handle_event()
tests/exynos: add fimg2d performance analysis
exynos/fimg2d: add g2d_config_event
tests/exynos: add fimg2d event test
tests/exynos: use XRGB8888 for framebuffer
exynos: fimg2d: add g2d_set_direction
exynos/fimg2d: add g2d_move
tests/exynos: add test for g2d_move
exynos: bump version number
Tom St Denis (4):
amdgpu: Unlock mutex if base_required is invalid
amdgpu: Fix use-after-free bug in vamgr_deinit
amdgpu: Cleanly handle ENOMEM on result in amdgpu_bo_list_create()
amdgpu: Make amdgpu_cs_calculate_timeout() return something sensible on error
Tvrtko Ursulin (1):
libdrm: Use userspace compatible type in fourcc_mod_code macro
Diffstat (limited to 'x11/libdrm')
-rw-r--r-- | x11/libdrm/Makefile | 4 | ||||
-rw-r--r-- | x11/libdrm/PLIST | 11 | ||||
-rw-r--r-- | x11/libdrm/distinfo | 12 | ||||
-rw-r--r-- | x11/libdrm/patches/patch-intel_intel__bufmgr__gem.c | 68 | ||||
-rw-r--r-- | x11/libdrm/patches/patch-xf86atomic.h | 15 |
5 files changed, 16 insertions, 94 deletions
diff --git a/x11/libdrm/Makefile b/x11/libdrm/Makefile index 5e796ee4606..a8a3621b9da 100644 --- a/x11/libdrm/Makefile +++ b/x11/libdrm/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.59 2015/09/29 08:23:18 wiz Exp $ +# $NetBSD: Makefile,v 1.60 2015/12/29 23:05:09 wiz Exp $ -DISTNAME= libdrm-2.4.65 +DISTNAME= libdrm-2.4.66 CATEGORIES= x11 graphics MASTER_SITES= http://dri.freedesktop.org/libdrm/ EXTRACT_SUFX= .tar.bz2 diff --git a/x11/libdrm/PLIST b/x11/libdrm/PLIST index 862c0915335..38e6143ec24 100644 --- a/x11/libdrm/PLIST +++ b/x11/libdrm/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.14 2015/08/14 17:12:35 wiz Exp $ +@comment $NetBSD: PLIST,v 1.15 2015/12/29 23:05:09 wiz Exp $ ${PLIST.arm}include/freedreno/freedreno_drmif.h ${PLIST.arm}include/freedreno/freedreno_ringbuffer.h include/libdrm/amdgpu.h @@ -13,7 +13,14 @@ ${PLIST.intel}include/libdrm/intel_bufmgr.h ${PLIST.intel}include/libdrm/intel_debug.h include/libdrm/mach64_drm.h include/libdrm/mga_drm.h -include/libdrm/nouveau.h +include/libdrm/nouveau/nouveau.h +include/libdrm/nouveau/nvif/cl0080.h +include/libdrm/nouveau/nvif/cl9097.h +include/libdrm/nouveau/nvif/class.h +include/libdrm/nouveau/nvif/if0002.h +include/libdrm/nouveau/nvif/if0003.h +include/libdrm/nouveau/nvif/ioctl.h +include/libdrm/nouveau/nvif/unpack.h include/libdrm/nouveau_drm.h include/libdrm/qxl_drm.h include/libdrm/r128_drm.h diff --git a/x11/libdrm/distinfo b/x11/libdrm/distinfo index 1fa89304082..2e73bf19454 100644 --- a/x11/libdrm/distinfo +++ b/x11/libdrm/distinfo @@ -1,16 +1,14 @@ -$NetBSD: distinfo,v 1.59 2015/11/04 03:28:47 agc Exp $ +$NetBSD: distinfo,v 1.60 2015/12/29 23:05:09 wiz Exp $ -SHA1 (libdrm-2.4.65.tar.bz2) = 74a6b2aa8c436e822e3ec5c52e463313c4e219d9 -RMD160 (libdrm-2.4.65.tar.bz2) = e3786ce6f49c520a73d782a4e020cdbaed4a57af -SHA512 (libdrm-2.4.65.tar.bz2) = fabbb3ba163aa1307288472c11c6ce8f1e412cbd67ba3135a614f0e05bf4f881bf6ccc581e9cf05a7e2e965817bb71c0b5335263b5c0b0cb85829a0f29a6029d -Size (libdrm-2.4.65.tar.bz2) = 645877 bytes +SHA1 (libdrm-2.4.66.tar.bz2) = 6637cc2d71b0011516804cc223a521bf301a9910 +RMD160 (libdrm-2.4.66.tar.bz2) = 34442dbddbedefa23499d48a86e9e7f1f23d8543 +SHA512 (libdrm-2.4.66.tar.bz2) = e0e3cea490389271690a79b5be8acd5e7c892a0646285617bd00d85f7c56ac163580c8c62d9fa79ed99e89468e35eaed6ac8be6ea870ce5ab09589f3e2d7f506 +Size (libdrm-2.4.66.tar.bz2) = 694574 bytes SHA1 (patch-ab) = ebc345d7f1aeb583b3ebb883fb3b27abc5b8133c SHA1 (patch-ac) = 67c998df7dfc0dabc86320ea6d015cede3e464ea SHA1 (patch-include_drm_drm.h) = 1cb10685b54a1c0ad71aef92edecbb0318fe4c99 -SHA1 (patch-intel_intel__bufmgr__gem.c) = bab22f43ba85c48fd063b6ac667369d1223f908f SHA1 (patch-libkms_vmwgfx.c) = d2204c0b79098c6c36b7f282b486c58c6354bd1d SHA1 (patch-radeon_radeon__bo__gem.c) = 4924fde172b2a2a713d47bf7b60a6b52851d7a8f SHA1 (patch-radeon_radeon__cs__gem.c) = 516b5dd6408c10a4f33f2815b3719e34a16d863a -SHA1 (patch-xf86atomic.h) = 49fce331dc287a26fc4c9de4a1d121d83a68d883 SHA1 (patch-xf86drmMode.c) = 508a1e4bae40243c5445ec51084e760279d35ba6 SHA1 (patch-xf86drmMode.h) = a28b02887389be8670193c119f711901af61a6b2 diff --git a/x11/libdrm/patches/patch-intel_intel__bufmgr__gem.c b/x11/libdrm/patches/patch-intel_intel__bufmgr__gem.c deleted file mode 100644 index fc2cb017317..00000000000 --- a/x11/libdrm/patches/patch-intel_intel__bufmgr__gem.c +++ /dev/null @@ -1,68 +0,0 @@ -$NetBSD: patch-intel_intel__bufmgr__gem.c,v 1.5 2014/10/26 10:20:10 wiz Exp $ - ---- intel/intel_bufmgr_gem.c.orig 2014-09-28 16:19:54.000000000 +0000 -+++ intel/intel_bufmgr_gem.c -@@ -47,6 +47,7 @@ - #include <unistd.h> - #include <assert.h> - #include <pthread.h> -+#include <stddef.h> - #include <sys/ioctl.h> - #include <sys/stat.h> - #include <sys/types.h> -@@ -399,13 +400,13 @@ drm_intel_gem_dump_validation_list(drm_i - (drm_intel_bo_gem *) target_bo; - - DBG("%2d: %d (%s)@0x%08llx -> " -- "%d (%s)@0x%08lx + 0x%08x\n", -+ "%d (%s)@0x%08llx + 0x%08x\n", - i, - bo_gem->gem_handle, bo_gem->name, - (unsigned long long)bo_gem->relocs[j].offset, - target_gem->gem_handle, - target_gem->name, -- target_bo->offset64, -+ (unsigned long long)target_bo->offset64, - bo_gem->relocs[j].delta); - } - } -@@ -1380,12 +1381,10 @@ map_gtt(drm_intel_bo *bo) - } - - /* and mmap it */ -- bo_gem->gtt_virtual = drm_mmap(0, bo->size, PROT_READ | PROT_WRITE, -- MAP_SHARED, bufmgr_gem->fd, -- mmap_arg.offset); -- if (bo_gem->gtt_virtual == MAP_FAILED) { -+ ret = drmMap(bufmgr_gem->fd, mmap_arg.offset, bo->size, -+ &bo_gem->gtt_virtual); -+ if (ret) { - bo_gem->gtt_virtual = NULL; -- ret = -errno; - DBG("%s:%d: Error mapping buffer %d (%s): %s .\n", - __FILE__, __LINE__, - bo_gem->gem_handle, bo_gem->name, -@@ -1991,8 +1990,9 @@ drm_intel_update_buffer_offsets(drm_inte - - /* Update the buffer offset */ - if (bufmgr_gem->exec_objects[i].offset != bo->offset64) { -- DBG("BO %d (%s) migrated: 0x%08lx -> 0x%08llx\n", -- bo_gem->gem_handle, bo_gem->name, bo->offset64, -+ DBG("BO %d (%s) migrated: 0x%08llx -> 0x%08llx\n", -+ bo_gem->gem_handle, bo_gem->name, -+ (unsigned long long)bo->offset64, - (unsigned long long)bufmgr_gem->exec_objects[i]. - offset); - bo->offset64 = bufmgr_gem->exec_objects[i].offset; -@@ -2012,8 +2012,9 @@ drm_intel_update_buffer_offsets2 (drm_in - - /* Update the buffer offset */ - if (bufmgr_gem->exec2_objects[i].offset != bo->offset64) { -- DBG("BO %d (%s) migrated: 0x%08lx -> 0x%08llx\n", -- bo_gem->gem_handle, bo_gem->name, bo->offset64, -+ DBG("BO %d (%s) migrated: 0x%08llx -> 0x%08llx\n", -+ bo_gem->gem_handle, bo_gem->name, -+ (unsigned long long)bo->offset64, - (unsigned long long)bufmgr_gem->exec2_objects[i].offset); - bo->offset64 = bufmgr_gem->exec2_objects[i].offset; - bo->offset = bufmgr_gem->exec2_objects[i].offset; diff --git a/x11/libdrm/patches/patch-xf86atomic.h b/x11/libdrm/patches/patch-xf86atomic.h deleted file mode 100644 index ddd4052580d..00000000000 --- a/x11/libdrm/patches/patch-xf86atomic.h +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-xf86atomic.h,v 1.1 2015/04/03 16:09:38 tnn Exp $ - -Fix a broken macro definition. - ---- xf86atomic.h.orig 2015-03-18 17:33:36.000000000 +0000 -+++ xf86atomic.h -@@ -93,7 +93,7 @@ typedef struct { LIBDRM_ATOMIC_TYPE atom - # define atomic_read(x) (int) ((x)->atomic) - # define atomic_set(x, val) ((x)->atomic = (LIBDRM_ATOMIC_TYPE)(val)) - # define atomic_inc(x) (atomic_inc_uint (&(x)->atomic)) --# define atomic_inc_return (atomic_inc_uint_nv(&(x)->atomic)) -+# define atomic_inc_return(x) (atomic_inc_uint_nv(&(x)->atomic)) - # define atomic_dec_and_test(x) (atomic_dec_uint_nv(&(x)->atomic) == 0) - # define atomic_add(x, v) (atomic_add_int(&(x)->atomic, (v))) - # define atomic_dec(x, v) (atomic_add_int(&(x)->atomic, -(v))) |