Commit Graph

217 Commits

Author SHA1 Message Date
matthieu
3870417379 restart recvmsg() if returning with errno==EINTR.
Fixes a crash on server reset on some machines.
Code inspired by ssh, with feedback from guenther@ and millert@
ok guenther@ miod@
2011-01-28 19:37:55 +00:00
matthieu
805ddd83d6 Effectively close the AGP device fd in xf86GARTCloseScreen() if it's
different from the consoleFd. Fixes crashes at server reset.
"looks good" miod@, oga@. Tested by shadchin@.
2011-01-28 19:34:22 +00:00
kettenis
31dc726d5a Call xf86Reconfigure() after readjusting the physical dimensions of the screen
based on EDID information.  Fixes issues with the mouse getting stuck on dual
card setups.  Still trying to push this one upstream.

ok matthieu@
2011-01-10 20:45:49 +00:00
matthieu
88ce1f7f0a Specify default xkb rules for Xnest and Xephyr. 2011-01-02 14:23:40 +00:00
matthieu
89dd5697ba Enable Xorg and a few drivers on hppa. Only wsudl works for now. 2011-01-02 14:04:18 +00:00
matthieu
74b2e4059b Repair build of Xorg on hppa 2011-01-02 13:29:50 +00:00
matthieu
55b9b068ae Bring fix from rev 1.12 back once more. ok oga@. 2010-12-22 21:36:05 +00:00
matthieu
dd56fb17b5 Update to xorg-server 1.9.3. Tested by japser@, landry@ and ajacoutot@
in various configurations.
2010-12-21 20:10:44 +00:00
kettenis
a67ea75b8d Initialize len before passing it to sysctl(3).
ok matthieu@
2010-12-06 21:21:52 +00:00
matthieu
428261197a Upgrade to xorg-server 1.9.2.
Tested by ajacoutot@, krw@, shadchin@ and jasper@ on various configurations
including multihead with both zaphod and xrandr.
2010-12-05 15:36:02 +00:00
matthieu
d57b1a146f regen (yes lots of files, since util-macros has been updated). 2010-09-01 13:43:24 +00:00
kettenis
e298c3717a Disable use of SIGIO by default; it breaks multi-card
configurations.  We don't want to run thousands of lines of
potentially signal-unsafe code for no particular benefit.

ok deraadt@, matthieu@, oga@
2010-09-01 09:32:32 +00:00
oga
f5152cf34c Don't even attempt to establish a SIGIO handler for DRI1.
This hasn't been used for a very, very, very long time, (since before
OpenBSD had dri support, for example) and it causes segfaults on dri
drivers when sigio is disabled. Now we don't need to do context swaps on sigio
nor are we trying to do interrupts in userland (thank fuck for that) this
function can die the death that I intended it to die about two years ago, may it
burn.

The kernel support the the sigio ioctl will be removed in a couple of
weeks to give people time to update (right now it accepts it, then
ignores it).

ok kettenis@, matthieu@.
2010-08-31 21:22:35 +00:00
kettenis
055af11423 Use the KERN_CONSDEV ioctl to figure out what the console device is and
attempt to open that first before trying /dev/ttyC[0-7].
This makes X autoconfiguration a tad bit more intuitive on machines
with multiple SBus or UPA framebuffers, where wsdisplay0 isn't the
console.  PCI framebuffers are still busted though.

ok matthieu@
2010-08-29 17:58:28 +00:00
kettenis
1fb6d3c868 Fix autoconfiguration for accelerated drivers on sparc/sparc64. Currently
limited to sunffb; others will need to be added to bsd_sbus.c if we start
shipping them.

ok matthieu@, oga@
2010-08-28 17:59:01 +00:00
oga
25b0cbcd49 Fix autoconfiguration on sparc and sparc64.
The code to add sunffb unconditionally on !solaris for __sparc__
systems is incorrect for openbsd. More specifically, due to interactions
between hardware drivers and wsfb in preinit we can't unconditionally
add wsfb to the list of fallbacks, so we only add wsfb if no other
option was found. Additionally sunffb does not need to be
unconditionally added because the bus probing code will find these
devices already.

So, long story short:  make that code chunk conditional on __sparc__ &&
defined(__linux__) instead.

change from !openbsd to __linux__ requested by kettenis@.

Tested by at least myself and stsp@.

ok matthieu@, kettenis@.
2010-08-18 22:37:36 +00:00
matthieu
fe603b97cb Fix X -keepPriv by calling xf86OpenConsole() early enough on architectures
that don't have a separate /dev/xf86. Problem noticed by kettenis@ and krw@
ok kettenis@.
2010-07-31 17:47:50 +00:00
matthieu
183207fd4d Add 4 files missed in xserver 1.8 update. 2010-07-27 19:05:15 +00:00
matthieu
95d684a05b Update to xserver 1.8. Tested by many. Ok oga@, todd@. 2010-07-27 19:02:24 +00:00
matthieu
50794663dd Add missing \n at end of message. 2010-05-20 05:00:14 +00:00
matthieu
b855bc3cce cope with the xinerama headers cleanup. From xserver git repository. 2010-04-27 20:12:19 +00:00
matthieu
49012820cb Add a configure test for newer proto headers and use it to enable
building xserver 1.6 with those headers. ok oga@.
2010-04-13 19:54:46 +00:00
oga
33290fb670 #if 0 out the code that listens for /dev/apm events.
A cleaner fix will be forthcoming, but for now this allows the xserver
to work nicely with the recent kernel vt-switch-on-suspend changes.

ok miod@
2010-03-30 17:43:19 +00:00
kettenis
42fc690ae9 Only add wsfb to the list of autoconfigured drivers if no other matches were
found.  Makes xorg.conf-less X work again on sparc64 and macppc systems with
a single display adapter.

ok matthieu@, beck@
2010-03-15 20:50:52 +00:00
matthieu
dde92d4099 basic support for mips64el. ok miod@. 2010-02-01 21:12:42 +00:00
matthieu
b4fa99e3fd regen 2009-12-18 22:50:53 +00:00
matthieu
e5c0b4face Build hppa support files on OpenBSD (useless for now). 2009-12-18 22:49:53 +00:00
matthieu
af37b41eec Adapt to modular X.Org. 2009-12-18 22:47:56 +00:00
matthieu
8542099ff7 Update to server 1.6.5. 2009-10-31 14:09:43 +00:00
matthieu
b6548f4956 Replace fbdev by wsfb as fallback driver on arches that support it.
Ok todd@, oga@.
2009-10-27 20:49:51 +00:00
matthieu
4c3c08d1e5 Add ChangeLog for xserver. It's part of the official X.Org tarballs. 2009-10-18 14:15:49 +00:00
matthieu
6b7a7e866e Merge intel driver autoconfiguration changes from upstream:
- don't list the dead i810 driver anymore
- blacklist the poulsbo chipset which isn't supported by
xf86-video-intel. Gives vesa a chance. ok oga@, kettenis@.
2009-10-06 05:57:00 +00:00
matthieu
00a307f8e4 Do not use 'deprecated' attribute on gcc < 3.1.
It causes lots of spurious warnings in build logs.
suggestion to make the test gcc >= 3.1 millert@, ok todd@, miod@
2009-09-13 15:02:03 +00:00
matthieu
888f50b07a Don't unconditionnally add a "sunffb" device in autoconfig mode
on OpenBSD. It will be added by sparcDriverName() if a ffb card
is present.
2009-09-11 22:12:50 +00:00
matthieu
e706500795 Bring Xnest back.
I had to disable its build during xserver 1.6 development because it
wasn't building for a while. But all problems are now fixed. ok todd@.
2009-09-11 06:17:29 +00:00
matthieu
0026b7ed04 restore version 1.12 of privsep.c which got accidentally reverted
by my xserver 1.6 merge. noticed by oga@
2009-09-08 19:52:26 +00:00
matthieu
768012be84 sparcDeviceName: do not fall back to wsfb if no hw specific driver
was found. This is done in the caller already.
While there change to a switch() construct to prepare for potential
future drivers addition.
2009-09-08 06:56:28 +00:00
matthieu
88f6f3ea75 update to xserver 1.6.4rc1. Tested by many, ok oga@. 2009-09-06 19:44:18 +00:00
oga
251e57a556 Make the !privsep and privsep paths a little more similar (still
checking the list), this allows drm to work in -keepPriv situations.

This diff has been in my tree awaiting proper testing for months, now
i'm sure it works correctly in it goes.

ok matthieu@ an aeon ago.
2009-07-14 18:25:16 +00:00
matthieu
3b890ddc49 Set default migration strategy to "greedy". ok oga@. 2009-06-29 21:26:43 +00:00
matthieu
cf96687724 provide mem_barrier() definition for amd64 too. from X.Org git. ok oga@ 2009-03-28 14:21:35 +00:00
kettenis
093965b9a6 Add code to choose a video driver based on the wscons(4) display type. Makes
it possible to run X without a configuration file on (some) sparc64 machines
and perhaps other machines that use wscons(4) frame buffers.

ok matthieu@
2009-02-19 21:53:30 +00:00
matthieu
5933d55f3d __miscmansuffix -> __miscmansuffix__ 2009-01-28 21:04:43 +00:00
matthieu
93ad800101 OpenBSD still uses old xkb-data, whose default rules are called 'xorg'.
Change kdrive's default configuration too.
2009-01-28 14:50:48 +00:00
matthieu
912bf2fa23 regen 2009-01-27 17:13:42 +00:00
matthieu
92d4b23d0e Fix linking of Xwscons for xserver 1.5.3 2009-01-27 17:11:33 +00:00
matthieu
8ff87a1d9a Don't allow to build kdrive here anymore. This is now in ../kdrive. 2009-01-27 16:28:57 +00:00
todd
0a00651cd8 more gcc2 breakage found by sparc 2009-01-20 23:13:14 +00:00
todd
6b96c02f57 note to self: no cookie, a compile started is not a compile tested 2009-01-13 19:46:28 +00:00
todd
8b1dd35d69 yet another gcc2 found bad coding practice, move variable declartion to the
top of the scope. this time found by sparc.
2009-01-13 16:30:45 +00:00