Update to 2.4.33, provided by Francois Tigeot in PR 46384.

Enable nouveau support.

2.4.33:

radeon: add TN surface support
intel: Add some PCI IDs for Haswell
omap: add omapdrm support

2.4.32:

radeon_cs_setup_bo: Fix accounting if caller specified write and read domains
intel: Mark up with valgrind intrinsics to reduce false positives
configure: Fix pkg-config test in absence of valgrind
radeon: fix pitch alignment for scanout buffer
intel: Detect cache domain inconsistency with valgrind
intel: Fix a typo in decode error message
intel: Add decode for gen7 3DSTATE_WM
intel: Add decode for gen7 HIER_DEPTH_BUFFER
intel: Import a new batchbuffer for the gen7 test
Don't require pciaccess if Intel is disabled
Make drm/drm_fourcc.h portable to non-linux platforms
xf86drmMode.h: Add header protection
intel: Add support for overriding the PCI ID via an environment variable
intel: Add .aub file output support
intel: Bump the copyright dates on the bufmgr files
intel: Fix error check for I915_PARAM_HAS_LLC
intel: Add support for (possibly) unsynchronized maps
intel: Move the gen4-6 3DPRIMITIVE handling out of the switch statement
intel: Add per-dword decode of gen7 3DPRIMITIVE
intel: Quiet two more valgrind complaints with recent changes

2.4.31:

intel: add sprite ioctl defines and struct for i915 sprite code
intel: Add a regression test for 2D decode, which I'm about to refactor
intel: Track the current packet location in the decode context
intel: Drop the code for counting parsing failures
intel: Plumb the context through the decode callchain
intel: Use the context to simplify BR00 and BR01 decode
intel: Make instr_out take the decode context
intel: Avoid the need for most overflow checks by using a scratch page
intel: Put the "gen" shorthand chipset identifier in the context
intel: Parse the correct length for gen7 3DSTATE_MULTISAMPLE
intel: Add support for parsing 965 3d packets using helper functions
intel: Move the logic for getting 965 3d packet length to the packet table
intel: Make most of the logic for 965 3d packet length checks table-driven
intel: Add support for parsing gen7 URB packets
intel: Add decode for gen7 state pointers
intel: Add decode for gen7 constant buffer packets
intel: Add minimal decode for remaining gen7 packets in use
intel: Fix bufmgr_gem->gen for gen > 4
Don't build Intel DRM if $CHOST is not i?86-* or x86_64-*
intel: Fix build of Intel DRM on x86 systems
intel: query for LLC support
radeon: add surface allocator helper v10
drmModeFreeResources() always leaked some memory
Using sizeof() on a function parameter with an array type does not work
radeon: surface fix macro -> micro tile fallback
radeon: fix surface API for good before anyone start relying on it
radeon: add r600_pci_ids.h to header file

2.4.30:

libdrm: update drm headers from kernel, including new overlay ioctls & structs
intel: Reset vma list upon purge
tests/gem_flink: Check for MASTER before proceeding
intel: Import intel_decode.c from intel-gpu-tools
intel: Make intel_chipset handle devid directly
intel: Add IS_GEN[567] macros
intel: Reformat intel_decode.c from intel-gpu-tools using Lindent
intel: Get intel_decode.c minimally building
intel: Fix Wsigned-compare warnings (soon to be enabled)
intel: Fix a ton of signed vs unsigned and const char *warnings
intel: Add printflike warnings for instr_out
intel: Fix printf format warnings for intel_decode
intel: Remove c99ish variable declarations
intel: Turn on normal warnings for intel_decode.c build
intel: Disable unused decode_logic_op()
intel/intel_decode.c: Remove #include "intel_decode.h"
intel: Add an interface for setting the output file for decode
intel: Add a regression test program for intel_decode.c
intel: Add regression tests for batch decode
intel: Update for new i915_drm.h defines

2.4.29:

intel: Clean up mmaps on freeing the buffer
test/radeon: add missing files for dist
intel: Add an interface to limit vma caching
intel: Evict cached VMA in order to make room for new mappings
intel: Update map-count for an early error return during mapping
intel: Remove the fresh assertions used to debug the vma cacheing

2.4.28:

Fix compilation with -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast
tests/radeon: radeon specific test
nouveau: Mark nouveau subchannel unbound nouveau_grobj_free
intel: limit aperture space to mappable area on gen3
intel: Unmap buffers during drm_intel_gem_bo_unmap

2.4.27:

Specify the return type explicitly
intel: fix the wrong method check for bo_get_subdata
intel: shared header for shader debugging
drm mode: fix drmIoctl wrapper
nouveau: assert argument cannot have side effects
modeprint.c: use PRIu64 for printing uint64_t
drm/intel: don't clobber bufmgr->pci_device
drm/i915: y tiling on i915G/i915GM is different
xf86drm.h : wrap C code for C++ compilation/linking
drm/test: handle usub being empty
drmtest: make check should fail so hard on unable to open device
modetest: use 24 bit depth on the framebuffer
tests: Add vmwgfx driver to probed drivers in tests
vbltest: Check error codes returned from libdrm
modetest: Check error message from pageflip ioctl
modetest: Print extra info if we fail to create a framebuffer
modetest: Call dirty fb on modeset
nouveau: free in error path if drmAvailable fails
intel: Use stdbool.h for dealing with boolean values
intel: Add an interface for removing relocs after they're added
intel: Don't call the SW_FINISH ioctl unless a CPU-mapped write was done
intel: Share the implementation of BO unmap between CPU and GTT mappings

2.4.26:

libkms: All current BO_TYPE are 32bpp
intel: Add interface to query aperture sizes

2.4.25:

don't try to build modetest without libkms
Build modetest for all chipsets, always build modeprint
drm: add dumb interface
Implement drmGetCap() to query device/driver capabilities
libkms: add dumb support
libdrm: oops fix get cap return value
build: Update autotools configuration
Cleanup gen2 tiling confusion
drm_mode: fix types on recently added ioctls
intel: Also handle mrb_exec fallback with ring == I915_EXEC_RENDER
libdrm: (revised) vblank wait on crtc > 1

2.4.24:

intel: Export CONSTANT_BUFFER addressing mode
nouveau: nvc0 drm has no concept of "notifier block"
nouveau: split pushbuf macros specific to nv04-nv50 out, and add nvc0
nouveau: fix up reloc_emit() to accept NULL target buffer
intel: Fallback to old exec if no mrb_exec is available
intel: compile fix for previous commit after rebasing
intel: Set the public handle after opening by name
intel: Remember named bo
libkms/radeon: Add backend
configure.ac: ac_define HAVE_RADEON
modetest: Create buffers using libkms
tests/modeprint: Remove needless dependency on drm_intel
tests/modeprint: Output masks as hex numbers
modetest: Do no flip twice to a current front buffer
intel: fix relaxed tiling on gen2
intel: Add I915_PARAM_HAS_RELAXED_DELTA

2.4.23:

intel: Downgrade error warnings to debug
nouveau: Define buffer object usage flags
nouveau: Let the user choose the push buffer size
nouveau: Define the HAS_PAGEFLIP getparam
intel: Prepare for BLT ring split
s/drmStrdup/strdup/
intel: enable relaxed fence allocation for i915
nouveau: Avoid unnecessary call to CPU_FINI
intel: Remove stale comment
intel: Shove the fake bufmgr subdata implementation into the fake bufmgr
intel: Remove gratuitous assert on bo_reference
intel: Drop silly asserts on mappings present at unmap time
intel: initialize bufmgr.bo_mrb_exec unconditionally
intel: Fix drm_intel_gem_bo_wait_rendering to wait for read-only usage too
nouveau: Add implicit pushbuf flush before gpuobj destruction
intel: Compute in-aperture size for relaxed fenced objects
intel: Add a forward declaration of struct drm_clip_rect
radeon: silence valgrind warnings by zeroing memory
intel: If the command is fenced inform the kernel
drm: don't do the create the node ourselves if we have udev
intel: Reorder need_fence vs fenced_command to avoid fences on gen4
tests: Update for ENOENT returns from unknown handles

2.4.22:

intel: Track tiling stride
intel: Defer tiling change to allocation
intel: Force stride to be 0 for I915_TILING_NONE
intel: Scan the cache for old bo once every second
intel: Print out debugging message following ENOSPC
intel: Sanitise strides for linear buffers and SET_TILING
intel: '===' != '=='
intel: Restore SET_TILING for non-flinked bo
intel: Only adjust the local stride used for SET_TILING in tiled alloc
intel: Limit tiled pitches to 8192 on pre-i965
intel: Suppress the error return from setting domains after mapping
Purge macro NEED_REPLIES
drm mode: Return -errno on drmIoctl() failure
Copy headers from kernel drm-core-next
libdrm: Fix PCI domain domain support
nouveau: accept both 0.0.16 and 1.x.x
Free the property blob along the error path
Avoid use of c++ reserved keyword "virtual" when using a C++ compiler
modetest: add edp and TV connector names to the connector name array
modetest: align fb pitch to 64 bytes
modetest: Fix drawing routines to use stride
nouveau: fix thinko in drm version check
nouveau: fix drm version check some more
intel: Replace open-coded drmIoctl with calls to drmIoctl()

2.4.21:

drm/radeon: add new cs command stream dumping facilities
nouveau: stop shipping nouveau_class.h
intel: Use the correct size when allocating reloc_target_info array
Make libkms build default OS-dependent
Correct the Solaris definitions of atomic_add & atomic_dec
radeon: use the const qualifier in radeon_cs_write_table
tests: add new vblank test
vbltest: Doesn't need intel stuff
intel: query whether a buffer is reusable
Pull in new kernel headers
Only build tests in make check
intel: Don't change tiling mode unless the kernel reports success
intel_bufmgr_fake: fix compile warning
Enable silent automake rules
libkms: Fix include paths
intel: Add support for kernel multi-ringbuffer API
Allow a buffer to point at itself and still get relocs
intel: Convert to untiled pitches if surface is too large for tiling
intel: Add more intermediate sizes of cache buckets between powers of 2
intel: Fix several other paths for buffers pointing at themselves
Fix radeon distcheck

3 files changed, 27 insertions, 10 deletions

diff --git a/x11/libdrm/Makefile b/x11/libdrm/Makefile
index fcf2bf75cd4..08192f2d76c 100644
--- a/x11/libdrm/Makefile
+++ b/x11/libdrm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2012/02/16 20:30:55 hans Exp $
+# $NetBSD: Makefile,v 1.16 2012/05/08 20:32:47 wiz Exp $
 #
 
-DISTNAME=		libdrm-2.4.20
+DISTNAME=		libdrm-2.4.33
 CATEGORIES=		x11 graphics
 MASTER_SITES=		http://dri.freedesktop.org/libdrm/
 EXTRACT_SUFX=		.tar.bz2
@@ -39,7 +39,9 @@ CONFIGURE_ENV+=		drm_cv_atomic_primitives=libatomic-ops
 . endif
 .endif
 
+CONFIGURE_ARGS+=	--enable-nouveau-experimental-api
 CONFIGURE_ARGS+=	PTHREADSTUBS_CFLAGS=-I${PREFIX}/include \
 			PTHREADSTUBS_LIBS=-L${PREFIX}/lib
 
+.include "../../sysutils/libpciaccess/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/libdrm/PLIST b/x11/libdrm/PLIST
index fa1100efa80..f93475ca099 100644
--- a/x11/libdrm/PLIST
+++ b/x11/libdrm/PLIST
@@ -1,13 +1,18 @@
-@comment $NetBSD: PLIST,v 1.5 2010/04/16 13:43:36 tnn Exp $
+@comment $NetBSD: PLIST,v 1.6 2012/05/08 20:32:47 wiz Exp $
 include/libdrm/drm.h
+include/libdrm/drm_fourcc.h
 include/libdrm/drm_mode.h
 include/libdrm/drm_sarea.h
 include/libdrm/i915_drm.h
+include/libdrm/intel_aub.h
 include/libdrm/intel_bufmgr.h
+include/libdrm/intel_debug.h
 include/libdrm/mach64_drm.h
 include/libdrm/mga_drm.h
 include/libdrm/nouveau_drm.h
+include/libdrm/nouveau_drmif.h
 include/libdrm/r128_drm.h
+include/libdrm/r600_pci_ids.h
 include/libdrm/radeon_bo.h
 include/libdrm/radeon_bo_gem.h
 include/libdrm/radeon_bo_int.h
@@ -15,17 +20,27 @@ include/libdrm/radeon_cs.h
 include/libdrm/radeon_cs_gem.h
 include/libdrm/radeon_cs_int.h
 include/libdrm/radeon_drm.h
+include/libdrm/radeon_surface.h
 include/libdrm/savage_drm.h
 include/libdrm/sis_drm.h
 include/libdrm/via_drm.h
-include/libkms/libkms.h
+include/nouveau/nouveau_bo.h
+include/nouveau/nouveau_channel.h
+include/nouveau/nouveau_device.h
+include/nouveau/nouveau_grobj.h
+include/nouveau/nouveau_notifier.h
+include/nouveau/nouveau_pushbuf.h
+include/nouveau/nouveau_reloc.h
+include/nouveau/nouveau_resource.h
+include/nouveau/nv04_pushbuf.h
+include/nouveau/nvc0_pushbuf.h
 include/xf86drm.h
 include/xf86drmMode.h
 lib/libdrm.la
 lib/libdrm_intel.la
+lib/libdrm_nouveau.la
 lib/libdrm_radeon.la
-lib/libkms.la
 lib/pkgconfig/libdrm.pc
 lib/pkgconfig/libdrm_intel.pc
+lib/pkgconfig/libdrm_nouveau.pc
 lib/pkgconfig/libdrm_radeon.pc
-lib/pkgconfig/libkms.pc
diff --git a/x11/libdrm/distinfo b/x11/libdrm/distinfo
index fbccef27faf..5e94f558da1 100644
--- a/x11/libdrm/distinfo
+++ b/x11/libdrm/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.15 2012/02/17 13:18:01 hans Exp $
+$NetBSD: distinfo,v 1.16 2012/05/08 20:32:47 wiz Exp $
 
-SHA1 (libdrm-2.4.20.tar.bz2) = f1448ac0f1c7a5f74a86d2fb50941fc12dc932db
-RMD160 (libdrm-2.4.20.tar.bz2) = 5581c45abfb9cb2bd0b95d4754d7812bb8323e3a
-Size (libdrm-2.4.20.tar.bz2) = 400812 bytes
+SHA1 (libdrm-2.4.33.tar.bz2) = 4da2c635491724e44326871e6a49ccfec0b6b5a6
+RMD160 (libdrm-2.4.33.tar.bz2) = 59ce56197f2f6f7069d2ddc23024e0ad680e20f4
+Size (libdrm-2.4.33.tar.bz2) = 446817 bytes
 SHA1 (patch-ab) = 66dadd3244bfa9c69be0982fd2108deb94483de2
 SHA1 (patch-ac) = 67c998df7dfc0dabc86320ea6d015cede3e464ea
 SHA1 (patch-ad) = ea3ef8de8db782ddab23f182f1e6bd9d8f612a78