NetBSD/xsrc fTH8dG3external/mit/libdrm/dist/intel intel_bufmgr_gem.c, external/mit/libdrm/dist/radeon radeon_bo_gem.c

   reduce diff to upstream

NetBSD/xsrc vE5gu3Sexternal/mit/xorg-server/include xorg-config.h dix-config.h

   define HAVE_BACKTRACE 1.  now X server crashes have backtraces in the log.

NetBSD/xsrc sR6ZkRmexternal/mit/xf86-video-r128/dist/src r128_output.c

   - don't try to access a nonexistant video BIOS
   - don't blindly assume VGA output
   - on mobility chips assume LVDS and VGA outputs if no other info is available
   Now this works again on my Pismo

NetBSD/xsrc pZziYfEexternal/mit/libdrm/dist/amdgpu amdgpu_bo.c

   fix compilation
+252-1791 files

NetBSD/xsrc lrP2q4Bexternal/mit/xorg-server/dist/render render.c

   Remove duplicate length check (undo diff to upstream)

NetBSD/xsrc CUS6xZUexternal/mit/xorg-server/dist/glx indirect_texture_compression.c swap_interval.c

   Undo merge botch, duplicate length checks

NetBSD/xsrc dNbMjlzexternal/mit/xorg-server/dist/hw/xfree86/drivers/modesetting driver.c

   pEnt isn't initialized at this point, don't free it
   Undo diff to upstream.

   There's a good chance we aren't using this code at all.

NetBSD/xsrc LI5PMttexternal/mit/xorg-server/dist/hw/xfree86/common xf86pciBus.c

   Undo unnecessary diff to vendor branch.

NetBSD/xsrc tfDiaFvexternal/mit/libdrm/dist/amdgpu amdgpu_vamgr.c

   don't mark a static function with default visibility.  (avoids warnings.)

NetBSD/xsrc wFx3IvVexternal/mit/libdrm/dist xf86drm.c xf86drmMode.c, external/mit/libdrm/dist/include/drm i915_drm.h

   merge libdrm 2.4.96.

NetBSD/xsrc XNB5UWAexternal/mit/libdrm/dist xf86drm.c, external/mit/libdrm/dist/amdgpu amdgpu_bo.c

   initial import of libdrm-2.4.96

NetBSD/xsrc vnKQdt2external/mit/xf86-video-vboxvideo/include config.h

   config.h for vboxvideo driver.

NetBSD/xsrc gzOtrzaexternal/mit/xf86-video-vboxvideo/dist configure aclocal.m4, external/mit/xf86-video-vboxvideo/dist/src VBoxVideo.h vboxvideo.c

   initial import of xf86-video-vboxvideo-1.0.0

NetBSD/xsrc BADRst1external/mit/libXxf86dga/dist/src XF86DGA.c

   use a destructor instead of atexit(3) to prevent SEGV's after dlclose.

NetBSD/xsrc PqKkKTeexternal/mit/libXau/dist AuFileName.c

   Don't use atexit(3) to free the buffer. Use a destructor instead so we don't
   segv if someone dlopened and dlclosed the library. Should fix:
+29-111 files

NetBSD/xsrc ImdBcEXexternal/mit/xf86-video-ati/dist/src theatre.h

   minor style fix for previous.

NetBSD/xsrc FWT3Efsexternal/mit/xf86-video-ati/dist/src/AtomBios CD_Operations.c

   redo previous slightly: restore packed attribute.

NetBSD/xsrc Yl1i2ljexternal/mit/xorg-server/include dix-config.h xorg-server.h

   revert some of the previous update to xorg-server 1.20.  i forgot
   that some of them were moved into makefiles so that Xx68k could
   build without them being defined.

NetBSD/xsrc 7Vbr1iOexternal/mit/xf86-video-intel/dist/src/sna sna_accel.c sna_driver.c, external/mit/xorg-server/dist/Xext xf86bigfont.c

   make the intel driver work again with xorg-server 1.20:

   - BlockHandler() timeout value changed from struct timeval ** to int **
     that has a millisecond value.

   - avoid a NULL ptr deref in ProcXF86BigfontQueryFont() and make some
     code actually able to be run.

NetBSD/xsrc LHpd7B9external/mit/xf86-video-intel/dist/src/uxa intel_display.c

   avoid using an uninitialised variable.

NetBSD/xsrc jMqisyslocal/programs/bdfload bdfload.c README

   a crude BDF font loader for wsdisplay

NetBSD/xsrc j10ogMXexternal/mit/xf86-video-ati/dist/src/AtomBios CD_Operations.c

   make this work with both the old and the new version of compiler.h

NetBSD/xsrc d4b08tZexternal/mit/xf86-video-ati/dist/src/AtomBios CD_Operations.c

   put back compatibility code for now; needed for sparc (from martin@)

NetBSD/xsrc GUjAAl2external/mit/xf86-video-ati/dist/src/AtomBios CD_Operations.c

   Remove compatibility code.

NetBSD/xsrc bXtD1BGexternal/mit/xorg-server.old/dist/hw/xfree86/ramdac xf86Cursor.c

   ad provde the cursor function...

NetBSD/xsrc d6hhISMexternal/mit/xorg-server.old/dist/hw/xfree86/common xf86xvmc.h xf86str.h, external/mit/xorg-server.old/dist/hw/xfree86/modes xf86Crtc.c

   Add compatibility to xorg-server-120
   - Convert display modes arguments to const.
   - Provive bswap* in misc.h
   - Provide missing cursor function

NetBSD/xsrc 2OyfMadexternal/mit/xf86-video-ati/dist/src theatre.h radeon.h

   add missing const

NetBSD/xsrc mI3tSO9external/mit/xorg-server/dist/hw/xfree86/os-support/bus netbsdSbus.c

   s/pointer/void */ in a few places.  remove now (void *) casts.

NetBSD/xsrc 3vPfX6hexternal/mit/xf86-video-ati-kms/dist/src radeon_video.c, external/mit/xf86-video-ati/dist/src radeon_atombios.c legacy_output.c

   fix various errors and warnings with xorg-server 1.20:

   - no Error() in scope
   - more wakeup/blockhandler ABI changes
   - more notify fd API changes
   - more xf86CursorResetCursor changes
   - lots of char* -> const char*
   - fix ati kms config.h now HAVE_XF86_CURSOR_RESET_CURSOR is available
   - another xf86GetOS() is removed fix
   - OsBlockSIGIO() etc, -> old, but still around API until properly converted
   - don't free const char * data owned by some other system

NetBSD/xsrc A3SaXQbexternal/mit/xf86-video-intel/dist/src compat-api.h, external/mit/xf86-video-intel/dist/src/sna sna_driver.c sna.h

   mostly fix amd64 xorg-server 1.20 builds:

   - avoid bswap_16 etc defines for now.  ends up with code-in-decl
   - more ABI_VERSION 23 fixes (BlockHandler/WakeHandler) including re-fix
     from previous
   - more Notify API
   - more shadowUpdatePackedWeak() removal
   - remove fd_set handling from intel driver (part of ABI_VERSION 23)
   - cope better with PixMap/Drawable separation in new server
   - remove support for maxHValue and maxVValue (XXX?)
   - hide drmmode_udev_notify() when not building udev
   - comment out nouveau 'wfb' support, xorg-server 1.20 only supplies
     either 'wfb' or 'fb' interface, not both, and we choose 'fb'
   - define 'pointer' in nv_proto.h rather than relying upon Xdefs.h
   - normalise the value of _XTYPEDEF_POINTER
   - EGL is broken (missing) in xsrc currently

NetBSD/xsrc j0jiGv9external/mit/xf86-video-intel/dist/src compat-api.h, external/mit/xf86-video-intel/dist/src/sna sna_accel.c sna_acpi.c

   various updates for xorg-server 1.20.  some of these are work-in-progress,
   the xsrc build is broken for most ports currently.

   - xf86DisableRandR() is gone
   - use HAVE_NOTIFY_FD like other modern drivers in compat-api.h
   - pRotatedPixmap is done
   - some PixmanPtr is now DrawablePtr (this one is all over problem with many
     consumers, and perhaps the major breakage point currently.)

NetBSD/xsrc tFLZPcaexternal/mit/xf86-input-mouse/dist/src mouse.c, external/mit/xf86-video-ati/dist/src radeon_driver.c

   updates for xorg-server 1.20:

   - xf86GetOS()/LoaderGetOS() have been replaced.  replace them with
     direct platform #ifdefs for now.
   - shadowUpdatePackedWeak() is gone, use local thunks.
   - xf86DisableRandR() is gone, disable it (should be obsolete)

NetBSD/xsrc hooCsnhexternal/mit/xorg-server/dist/include xserver_poll.h

   s/inclue/include/ in an error message.

NetBSD/xsrc pmaT54cexternal/mit/xorg-server/dist/hw/xfree86/common xf86AutoConfig.c

   use xf86AddMatchedDriver().

NetBSD/xsrc E2c6UDaexternal/mit/xorg-server/include version-config.h

   comment VENDOR_NAME here.

NetBSD/xsrc LfODApyexternal/mit/xorg-server/include xorg-server.h dix-config.h

   disable local reallocarray() for now.

NetBSD/xsrc voTEy90external/mit/xorg-server/include xf86Build.h

   update for xorg-server 1.20

NetBSD/xsrc oKwJlk3external/mit/xorg-server/dist configure, external/mit/xorg-server/dist/glx glxcmds.c

   merge xorg-server 1.20.3.

NetBSD/xsrc Zot71fGexternal/mit/xorg-server/dist ChangeLog configure, external/mit/xorg-server/dist/glamor glamor_picture.c

   initial import of xorg-server-1.20.3

NetBSD/xsrc 3EgN06yexternal/mit/xkeyboard-config/dist configure config.guess, external/mit/xkeyboard-config/dist/symbols ir in

   merge xkeyboard-config 2.25.

NetBSD/xsrc AnhtnDeexternal/mit/xkeyboard-config/dist/po zh_CN.po eo.po

   initial import of xkeyboard-config-2.25

NetBSD/xsrc kDgiGfNexternal/mit/pixman/dist/pixman pixman.h pixman-private.h, external/mit/pixman/include config.h

   merge pixman 0.36.0.

NetBSD/xsrc BDt5Wugexternal/mit/pixman/dist config.guess aclocal.m4, external/mit/pixman/dist/test

   initial import of pixman-0.36.0

NetBSD/xsrc WYWNoSlexternal/mit/fonttosfnt/dist struct.c NEWS

   merge fonttosfnt 1.0.5.

NetBSD/xsrc zp7G7Djexternal/mit/fonttosfnt/dist configure aclocal.m4, external/mit/fonttosfnt/dist/man

   initial import of fonttosfnt-1.0.5

NetBSD/xsrc Ffg2hDhexternal/mit/xf86-video-ati-kms/dist/src radeon_bo_helper.c

   avoid using GBM_BO_USE_LINEAR if it isn't defined.

   XXX: xorg-server 1.18 issue?

NetBSD/xsrc Cl9nkxhexternal/mit/xf86-video-ati-kms/dist/src radeon_kms.c, external/mit/xf86-video-ati-kms/include config.h

   merge ati driver 18.1.0.

NetBSD/xsrc dve4HBjexternal/mit/xf86-video-ati-kms/dist ChangeLog configure, external/mit/xf86-video-ati-kms/dist/src drmmode_display.c radeon_bo_helper.c

   initial import of xf86-video-ati-18.1.0

NetBSD/xsrc KgCSCPBexternal/mit/xf86-video-r128/dist/src r128_exa.c r128_driver.c

   fix merge botch -- at least compiles now.

NetBSD/xsrc FOawphoexternal/mit/xf86-video-mga/dist/src mga_dri.c mga_driver.c, external/mit/xf86-video-r128/dist/src r128_driver.c r128_output.c

   merge mga 2.0.0 and r128 6.12.0 drivers.