merge xorg-server 21.1.20.

initial import of xorg-server-21.1.20

merge xorg-server 21.1.18.

initial import of xorg-server-21.1.18

merge xorg-server 21.1.16.

merge xorg-server 21.1.13.

initial import of xorg-server-21.1.13

fix build on alpha.

some clean up upstream didn't get tested on alpha it seems, with both
missing CARD8 etc identifiers as well as dead/duplicate code.

initial import of xorg-server-21.1.9

initial import of xorg-server-21.1.6

initial import of xorg-server-21.1.5

Restore -flipPixels option removed in upstream server-21.1-branch.

https://gitlab.freedesktop.org/xorg/xserver/-/commit/d1c00c859c6676fbb540420c9055788bc19cb18f
Note ScrnInfoRec structure in hw/xfree86/common/xf86str.h isn't reverted
because it isn't used by -flipPixels option so that we can keep ABI
compatibility among xf86-video-foo drivers.

This -flipPixels is mandatory at least by Xorg server users with
xf86-video-wsfb driver on NetBSD/mac68k and SE/30 mono screen
that has "black=1 and white=0" VRAM.

"go for it" by mrg@ on current-users@:
https://mail-index.netbsd.org/current-users/2022/07/24/msg042731.html

initial import of xorg-server-21.1.4

fix merge botch.

merge xorg-serer 21.1.3.

initial import of xorg-server-21.1.3

merge xorg-server 1.20.12 and xkeyboard-config 2.33.

initial import of xorg-server-1.20.12

Add missing include of compiler.h and make all declarations of
IOPortBase consistent.

Avoid multiple definitions of the same variable.

initial import of xorg-server-1.20.11

initial import of xorg-server-1.20.10

merge xorg-server 1.20.6.

initial import of xorg-server-1.20.6

Revert previous two commits, will fix this another way.

Don't autoload vesa on x86 at all as it conflicts with wsfb.

Try wsfb before vesa on x86. Modern video cards may not support VBE at all.

Try modesetting on x86, too.

Not the best option without functional GLAMOR, but it does work.

Match wsfb on x86, too.

When uefi booting without driver-specific GPU support, wsfb is the only
choice for a graphical driver.

While here, combine the wsfb cases.

initial import of xorg-server-1.20.4

Try the modesetting driver before wsfb on NetBSD arm and aarch64

Undo unnecessary diff to vendor branch.

use xf86AddMatchedDriver().

merge xorg-server 1.20.3.

initial import of xorg-server-1.20.3

apply fixes for CVEs 2017-12176 to 2017-12187.

--
From 1b1d4c04695dced2463404174b50b3581dbd857b Mon Sep 17 00:00:00 2001
From: Nathan Kidd <nkidd@opentext.com>
Date: Sun, 21 Dec 2014 01:10:03 -0500
Subject: hw/xfree86: unvalidated lengths

This addresses:
CVE-2017-12180 in XFree86-VidModeExtension
CVE-2017-12181 in XFree86-DGA
CVE-2017-12182 in XFree86-DRI
--
From 211e05ac85a294ef361b9f80d689047fa52b9076 Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb@suse.com>
Date: Fri, 7 Jul 2017 17:21:46 +0200
Subject: Xi: Test exact size of XIBarrierReleasePointer

Otherwise a client can send any value of num_barriers and cause reading or swapping of values on heap behind the receive buffer.
--
From 4ca68b878e851e2136c234f40a25008297d8d831 Mon Sep 17 00:00:00 2001
From: Nathan Kidd <nkidd@opentext.com>
Date: Fri, 9 Jan 2015 10:09:14 -0500
Subject: dbe: Unvalidated variable-length request in ProcDbeGetVisualInfo
(CVE-2017-12177)

v2: Protect against integer overflow (Alan Coopersmith)
--
From 55caa8b08c84af2b50fbc936cf334a5a93dd7db5 Mon Sep 17 00:00:00 2001
From: Nathan Kidd <nkidd@opentext.com>
Date: Fri, 9 Jan 2015 11:43:05 -0500
Subject: xfixes: unvalidated lengths (CVE-2017-12183)

v2: Use before swap (Jeremy Huddleston Sequoia)

v3: Fix wrong XFixesCopyRegion checks (Alan Coopersmith)
--
From 859b08d523307eebde7724fd1a0789c44813e821 Mon Sep 17 00:00:00 2001
From: Nathan Kidd <nkidd@opentext.com>
Date: Wed, 24 Dec 2014 16:22:18 -0500
Subject: Xi: fix wrong extra length check in ProcXIChangeHierarchy
(CVE-2017-12178)
--
From 9c23685009aa96f4b861dcc5d2e01dbee00c4dd9 Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb@suse.com>
Date: Fri, 7 Jul 2017 17:04:03 +0200
Subject: os: Make sure big requests have sufficient length.

A client can send a big request where the 32B "length" field has value
0. When the big request header is removed and the length corrected,
the value will underflow to 0xFFFFFFFF. Functions processing the
request later will think that the client sent much more data and may
touch memory beyond the receive buffer.
--
From b747da5e25be944337a9cd1415506fc06b70aa81 Mon Sep 17 00:00:00 2001
From: Nathan Kidd <nkidd@opentext.com>
Date: Fri, 9 Jan 2015 10:15:46 -0500
Subject: Unvalidated extra length in ProcEstablishConnection (CVE-2017-12176)

fix misplaced conditionalized } that broke pointer detection under
vmware when running X without a config file.

Add explicit cast before writing to newly allocated memory.

XXX Beside the strange allocation size, this could be XNFstrdup.

don't use const char for these types, many drivers write to them.

ok mrg

fix build issues for sparc64. mostly constification.

check for __arm__ as well as __arm32__.

fix merge botches.

first merge of netbsd changes. not tested yet.

initial import of xorg-server-1.18.4

Try xf86-video-nouveau for nvidia devices by default.

Fall back to nv (and then vesa and then wsfb) if it doesn't work.

don't look for _drv.o files. we haven't built any since the bad old days
when all the world was xfree86.

remove superfluous casts.

Remove some redundant function redeclarations, as noted in
http://mail-index.netbsd.org/tech-x11/2015/01/09/msg001452.html

The changes come from upstream in commits:

* xserver:
ecf62755 Define prototypes for hw/xfree86/modes/xf86Modes.c only in xf86Modes.h.
- didn't add xf86SaveModeContents which isn't defined in our version

0bc41d5f Remove redundant redeclarations of functions in the same header file

5595e7ce randr: Remove redundant declaration.

471e5373 Remove duplicate declaration of xf86ValidateModesFlags in xf86Modes.h

9ef53e22 include: GetClientResolutions is declared in font.h

8b6a7500 Fix gcc warnings about redundant declarations of fallback functions
- just took ffs() #ifdef defense, so most not applied


* xf86-video-nv:
49ee1c26 Include xf86Modes.h to use functions from hw/xfree86/modes/xf86Modes.c.

* xf86-video-savage:
2e9217bb Include xf86Modes.h to use functions from hw/xfree86/modes/xf86Modes.c.

for i386 and amd64, append vesa to the end of the possible video driver
list. makes "startx" without a config file work on systems where there is
a known native driver, but it is not installed (like "vboxvideo").

Lint does not know about pragmas

fix for lint

add a field to struct sbus_device which records the framebuffer size reported
by ioctl(FBIOGATTR) so drivers can use it

merge xorg-server 1.10.6.

initial import of xorg-server-1.10.6

when using dixSetPrivate() and friends it helps to initialize the key before
using it. Now colours on suncg6 look right again and we don't spin or crash
on exit anymore.
probably needs to be pulled into -6

Add vax to the list of non inb() users

if the video driver is "vmware" or "vmwlegacy" and no mouse section exists,
use the "vmmouse" input driver instead of "mouse" -- now xorg works properly
in vmware without a config file

xsrc/45442: X -configure doesn't detect S3 Trio32/64

Backout the following commit from upstream:
http://cgit.freedesktop.org/xorg/xserver/commit/hw/xfree86/common/xf86Helper.c?id=0ceac6f64f5ad9bc2ac4b19be2dd245ffba78b05

Despite what the log message says, xf86MatchDevice can be called at
configure time by drivers who still implement the legacy probing API (and
there are a lot of them!).

When configuring a new PCI or SBus device, remember to stash the bus
specific information (in pVideo for PCI or sVideo for SBus), otherwise
more than one driver may try to attach to the device and 'X -configure'
will fail with "Number of created screens does not match number of
detected devices".

re-apply patch from revision 1.2:

GenerateDriverlist: Change driver matching pattern to be the same as the
one used by the module loader.

merge cornflakes with xorg-server 1.10.3

initial import of xorg-server 1.10.3. highlights include:
- fixes xorg bugs 29969, 30367, 30527, 30267, 30260, 29046,
30260, 31548, 28672, 24887, 32115, 21457, 32436, 21827,
28414, 24703, 32803, 16318, 33449, 33324, 33929, 35082,
35209, 36146, 36119
- many additional NULL checks
- adjustments related to input ABI 12
- *lots* of dead code removal
- vga arbitrator fixes
- GL fixes
- EDID fixes
- conversion to using asprintf() in many places
- many fixes from valgrind, compiler warnings

see these for more details:
http://lists.freedesktop.org/archives/xorg-announce/2011-February/001612.html
http://lists.freedesktop.org/archives/xorg-announce/2011-April/001646.html
http://lists.freedesktop.org/archives/xorg-announce/2011-May/001675.html
http://lists.freedesktop.org/archives/xorg-announce/2011-July/001710.html

initial import of xorg-server 1.9.5
fixes for FDO bugs 33929, 32803, 24703, 28414, 24887, 30260, 31093, 29046, 30267
memory leak fixes
EDID and modes fixes for multi-screen
dri2 fixes
randr vs invalid size fixes
fixes for Xext triggers
fix for a black-screen after VT switch back (redhat bug 533217)
fixes for x86emu

- get platform #ifdefs in a slightly more sane order
- look for SBus and UPA devices on sparc(64)
- add default drivers for shark and sgimips
- only try wsfb if we can't find any other usable device
With this Xorg without config file works fine on shark, sparc(64) and amd64,
should work on other archs as well.

Fix merge and ARM define handling.

make this compile on sparc64

put back a little bit of BUS_ISA, enough for shark and chips driver.

put BUS_ISA back, we need it for the chips driver on shark

fix a merge botch.

merge xorg-server 1.9.2.

import xorg-server 1.9.2. important changes since 1.6.5 include:

- built-in symbol visibility, default not export
- fixes for various crashes
- many fixes for XI2, EXA, dix, render, glx, xkb, EDID, randr, Xv,
resource handling, Xext, vfb, xfree86 / vga and composite support.
- fixes several memory leaks
- many many documentation updates
- record extension enabled
- no longer looks for XF86Config files

fix a segfault in xf86EnterServerState() which would fire whenever there is
more than one graphics device
This is a bandaid, we ( or the Xorg people ) need to fix it properly by
getting rid of all the now useless RAC-related code.

merge xorg-server 1.6.5

initial import of xorg-server-1.6.5

let xf86AddBusDeviceToConfigure() accept BUS_ISA and BUS_NONE

when writing PCI BusIDs include the domain ID if it's non-zero
While there also add
Option "Protocol" "wskbd"
Option "Device" "/dev/wskbd"
to the keyboard section on non-x86
Now X -configure should dump something more usable.

merge xorg-server 1.6.2

initial import of xorg-server-1.6.2

remove a wrong extra {}.

merge xorg-server 1.6.1.190.

XXX: our Pci.[ch] changes need to be re-looked at, i think.

initial import of xorg-server-1.6.1.901

more bits'n'pieces for sparc support

GenerateDriverlist: Change driver matching pattern to be the same as the
one used by the module loader.

videoPtrToDriverName: use the 'intel' driver instead of 'i810'.

look for __arm__ as well.

initial import of xorg-server-1.4.2