Commit Graph

211 Commits

Author SHA1 Message Date
matthieu
577763cda7 Uodate to xserver 1.14.2. Tested by krw@, shadchin@, todd@ 2013-08-24 19:44:25 +00:00
mlarkin
ed3e701ae3 Corresponding xenocara cleanup from the amd64/i386 MTRR cleanup diff just
committed. Removes a #define that wasn't used anywhere (for completeness
and to make the range definitions match what's in the kernel now).

ok jsg@, deraadt@
2013-08-24 04:31:54 +00:00
aoyama
2db9dc4ecc Re-commit luna88k_video.c. Previous file is 'doubled' by mistake. 2013-07-16 14:39:22 +00:00
aoyama
08420f85c8 Add monochrome X server support for luna88k.
Some luna88k specific quirks are needed in
driver/xf86-video-wsfb/src/wsfb_driver.c for now.

ok matthieu@
2013-07-15 13:23:17 +00:00
matthieu
adec87cf5d Update to X server 1.14.1. Tested by many during t2k13. Thanks. 2013-06-07 17:28:45 +00:00
todd
7cfc4a7689 backport (whitespace changes only) a fix for panning that also effected scale
to permit:
   xrandr --output LVDS1 --mode 1280x800 --panning 1380x1024 --scale 1.8x1.8
to behave properly.
based on upstream commit 1bf81af4a6be1113bcc3b940ab264d5c9e0f0c5d that is in
the 1.14 xserver that is not ready for OpenBSD yet
ok matthieu@
2013-03-21 21:26:08 +00:00
tobiasu
5530414e6d Include declaration of sparcDriverName()
Fixes segfault on sunffb graphics. ok matthieu@
2012-11-04 17:20:33 +00:00
matthieu
e26a212fd0 Regen autotools build system with a clean environment.
It was previously generated with a config pointing to OpenBSD's libtool
which is not ready yet.
2012-10-27 14:52:25 +00:00
matthieu
58d9658ddc regen 2012-10-14 08:59:33 +00:00
matthieu
ee040bc225 Fix bad merge that changed an fcntl() into a priv_open_device().
Should fix mouse re-open after VT-switch
2012-10-08 22:40:43 +00:00
matthieu
143961ca76 Un-blacklist radeon, blacklist radeonold. So X -configure will now
select the radeon driver.
2012-08-08 16:37:19 +00:00
matthieu
20c1ecb828 Remove white space diff with X.Org. 2012-08-07 20:12:01 +00:00
matthieu
eb59960f12 regen autotools 2012-08-05 18:14:29 +00:00
matthieu
fe11647d1f Update to xserver 1.12.3. 2012-08-05 18:11:37 +00:00
matthieu
baeff29842 screenFd -> consoleFd conversions that were missed in xserver 1.12 import. 2012-06-16 15:08:08 +00:00
matthieu
e60da74507 Update to xserver 1.12.2. tested by naddy@, krw@, mpi@. 2012-06-10 13:21:05 +00:00
matthieu
e4b13eedd8 Introduce a black list of drivers for Xorg -configure, and blacklist
all radeon driver variants, except radeonold.
This fixes the conflicting symbols warnings seen by Xorg -configure
and forces it to use radeonold in the generated xorg.conf file.

Xorg -configure is still broken in many ways, and should be
avoided.
2012-03-04 17:55:31 +00:00
matthieu
9576ef223d Update to xserver 1.11.4. tested by krw@, shadchin@. 2012-01-31 07:52:35 +00:00
matthieu
4344ac3914 Bugfix Update to xserver 1.11.3 2011-12-18 16:08:59 +00:00
matthieu
61a7d5427d Update to xserver 1.11.2 2011-11-05 13:32:40 +00:00
matthieu
a4d630d049 regen 2011-06-29 19:57:45 +00:00
matthieu
b6047701ef Introduce new autoconfiguration code for X input drivers, based on X
hotplug framework.This also takes care of the configuration of the
keyboard layout from the wscons layout that was hacked inside the
keyboard driver.

Tested by many, ok oga@.
2011-06-29 19:55:01 +00:00
matthieu
4a238ea6a4 Update to xserver 1.9.5. Tested by jasper@, ajacoutot@ and krw@ 2011-04-02 16:08:38 +00:00
matthieu
2cc47a1202 add a new build switch 'XENOCARA_USE_XKEYBOARD_CONFIG' to enable
the use of xkeyboard-config xkb definitions instead of the old xkbdata.
This will make testing easier. No changes in default builds.
ok shadchin@
2011-03-08 07:59:23 +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
74b2e4059b Repair build of Xorg on hppa 2011-01-02 13:29:50 +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
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
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
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
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
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
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
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
matthieu
8d98f5900d regen 2009-01-12 20:18:51 +00:00
matthieu
369cc172f4 Update to xserver 1.5.3 + latests commits on server-1.5-branch.
tested by stsp@, david@, form@, ckuethe@, oga@. thanks.
2009-01-12 20:17:47 +00:00
matthieu
56555c5689 - move wsfb(4) to where it belongs.
- also rename via -> openchrome.
2008-12-23 11:04:49 +00:00
matthieu
594af7d8f5 - i810 -> intel, noticed by mpf@ (already fixed in -current X.Org)
- add a reference to wsfb(4).
2008-12-23 11:03:25 +00:00
matthieu
3a0e900dcf missing action in if statement. 2008-11-23 12:06:43 +00:00
matthieu
9bd69e2c49 Fix from X.Org master git for XAA screen corruption.
XAA PixmapOps: Sync before accessing unwrapped callbacks.

    When using any XAAPixmapOps, we call into unknown but freshly
    unwrapped callbacks (like fb ones). Unlike the XAA*Fallback calls,
    we did so without syncing first, exposing us to all kinds of
    synchronisation issues.

    I believe that the rendering errors appeared now because *PaintWindow
    vanished (e4d11e58), and we just use miPaintWindow instead. This
    takes a less direct route to the hw and ends up at
    PolyFillRectPixmap, which very often left drawing artifacts.

    We now sync accordingly, and no longer get the rendering artifacts i
    was methodically reproducing on radeonhd, radeon, unichrome...

    Also, in order to allow driver authors to remove extensive syncing
    or flushing to hide this issue, create XAA_VERSION_ defines, put
    them in xaa.h and bump the patchlevel.

tested by naddy@ and Edd Barrett. ok oga@.
2008-11-11 20:31:42 +00:00
todd
519385f8fc more gcc2 fixes courtesy sparc 2008-11-05 07:04:31 +00:00
matthieu
51ad66e69b Initialise the aperture file descriptor in libpciaccess. 2008-11-04 22:22:12 +00:00
todd
65e3b816dc variable declarations at the beginning of the scope; found by sparc (a gcc2 arch) 2008-11-04 16:50:50 +00:00
matthieu
51153ff8f7 Update to libpciaccess world. 2008-11-04 05:58:43 +00:00
matthieu
60021fe985 xserver 1.5.2. tested by ckuethe@, oga@, and others. 2008-11-02 15:26:08 +00:00
matthieu
79662dec2b PR 5005: On alpha, trust the PCI BARS from SRM. ok kettenis@, miod@. 2008-10-07 21:56:39 +00:00
kettenis
ae7aae814f Make X stop messing with PCI BARs on sparc64. Makes ati driver work again
on Ultra 5/10 machines.

ok matthieu@, oga@
2008-09-20 15:53:42 +00:00
matthieu
35e1104889 Typo (the the). From Thomas Bozdar (Thomas dot Bosdar at quest dot com).
Thanks.
2008-08-30 13:38:43 +00:00
kettenis
9eb4db42c5 Since wscons(4) manages the hardware cursor for us, there's no nee to
fiddle with it here.  Pointed out by miod@.

ok matthieu@
2008-08-25 19:49:29 +00:00
kettenis
fac304a838 Unbreak sparc build. 2008-08-24 21:36:20 +00:00
kettenis
2f23f1f1a3 Make -configure work for SBus/UPA devices instead of crashing.
ok matthieu@
2008-08-24 21:02:23 +00:00
kettenis
afa6528308 Add enough OpenBSD-specific sbus support code to be able to support the
sunffb driver.

ok matthieu@
2008-08-21 20:06:35 +00:00
kettenis
16470a32ee All the resources claimed by xf86StdAccResFromOS() are PC-specific. On sparc64
PCI address space is completely seperate, so we don't have to claim any
resources to avoid clashes with main memory and firmware.  Makes accelerated
graphics work on the Tadpole SPARCLE.

ok matthieu@, oga@
2008-07-31 06:59:34 +00:00
matthieu
48d39de3dc The amd driver has been renamed geode. ok deraadt@ oga@. 2008-07-30 21:43:11 +00:00
matthieu
1dd309dcb0 use the openchrome driver for via chipsets. 2008-07-12 13:02:55 +00:00
matthieu
0a77d3ef3e Add a man page for Xephyr, with information from the README file. 2008-06-15 16:20:07 +00:00
matthieu
97eda17882 Update to xserver 1.4.2. Tested by landry@, ckuethe@, jsing@ mbalmer@. 2008-06-15 00:17:32 +00:00
mbalmer
ef9d4b4b8c Pull in a patch from X.Org-current to let X11 run on AMD Geode LX
CPUs in basic VESA mode:

X86EMU: handle CPUID instruction

Starting X on an AMD Geode LX system such as an Alix board with VGA
connector, the Xorg driver attempts to issue INT 10/0 to go to mode
3 (VGA).  The emulator, running the BIOS code, would then spit out:

	c000:0282: A2 ILLEGAL EXTENDED X86 OPCODE!

The opcode was 0F A2, or CPUID; it was not implemented in the
emulator. With this patch it handles the CPUID instruction in one of
two ways:

1) if ran on __i386__ or __x86_64__ then it calls the CPUID instruction
   directly.

2) if ran elsewhere it returns a canned 486dx4 set of values for function 1.

Tested with & ok matthieu
2008-06-10 22:31:30 +00:00
phessler
f80be2c38a Remove the special case for amd64 using MTRR. Wasn't compiled in in the
first place, and didn't work anyways.

ok deraadt, oga, matthieu
2008-06-09 22:55:10 +00:00
matthieu
48bc822959 regen. 2008-05-24 20:39:01 +00:00
matthieu
1b5891c504 implement the --disable-ioport configure option to disable the build of
ioport and its symlinks and use that option. Requested by kettenis@
and others.
2008-05-24 20:36:04 +00:00
matthieu
67dcbeb5eb If privsep support isn't compiled in, use open() to open the agp device. 2008-04-01 21:08:01 +00:00
matthieu
7830df18ed Regen with autoconf 2.59-p2, with AM_SANITY check zapped. 2008-03-15 18:08:24 +00:00
miod
5fb9099459 Don't #define DEBUG anymore 2008-02-16 21:40:44 +00:00
miod
a1df61e9c2 Remove unused global. 2008-02-16 21:40:29 +00:00
miod
af5d7dc88a Correctly link ioperm_noop.c to the build on m68k. ok matthieu@ 2008-02-13 21:33:29 +00:00
miod
d00b6d3f21 Remove a unused static function which references a function which had been
removed in the 1.4 update, it prevents wsfb from working on platforms without
lazy binding.
2008-02-13 21:29:52 +00:00
matthieu
4bd8c8049d Remove a bunch of files that get generated during a normal build. 2008-02-11 23:05:25 +00:00
matthieu
daec730aa0 Remove empty unused files. 2008-02-11 22:59:20 +00:00
matthieu
37eae9b7cf Fix m68k builds. Similar to the fix that miod used. 2008-01-27 14:03:40 +00:00
matthieu
478587a2d7 Fix from X.Org for CVE-2007-5760 - XFree86 Misc extension out of
bounds array index.
2008-01-17 15:41:18 +00:00
matthieu
dc769e8a75 Based on a suggestion and an initial patch by kettenis@, build
both the old i810 and the new intel drivers on i386, and let X
autoconfiguration code choose the one that is used based on the chipset.
Tested by landry@ and a few others.
2008-01-16 23:20:50 +00:00
jsing
6189593aff regen 2008-01-04 14:01:04 +00:00
jsing
458c03da50 Add support for xserver on OpenBSD/sgi and enable build.
ok matthieu@
2008-01-04 13:44:23 +00:00