Commit graph

1522 commits

Author SHA1 Message Date
Adam Jackson
216bccb00c 'make dist' fixes.
(cherry picked from 0409e1627a commit)
2006-11-08 16:17:38 -05:00
Bram Verweij
be91a981df xfree86/linux acpi: fix tokenising
Split on a space, rather on the 'video' string, as strtok takes a char,
not a string.
(cherry picked from 0567a6337b commit)
2006-11-08 18:10:40 +02:00
Daniel Stone
66b2c9bd2d add 'general socket' handler, port ACPI to use it
Add a general socket (not input device, but still need to be woken for it)
handler to both the DIX and XFree86, and make XFree86's ACPI handling use
it.  This stops DPMS waking up every time an ACPI notification comes in.
2006-11-08 18:10:40 +02:00
Bjorn Helgaas
58653b676d Do not map full 0-1MB legacy range
If we're mapping something in the "legacy range" (0-1Mb), we shouldn't
expand the requested range to the entire 0-1Mb range.  Typically this
is for mapping the VGA frame buffer, and some platforms support mmap of
the frame buffer but not the entire 0-1Mb range.

For example, HP sx1000 and sx2000 ia64 platforms can have memory from
0-0x9ffff, VGA frame buffer from 0xa0000-0xbffff, and memory from
0xc0000-0xfffff.  On these platforms, we can't map the entire 0-1Mb
range with the same attribute because the memory only supports WB,
while the frame buffer supports only UC.  But an mmap of just the
frame buffer should work fine.
(cherry picked from bd0c829654 commit)
2006-11-08 10:18:51 -05:00
Egbert Eich
93ae22b16b Fixing mach64 driver bailing out on ia64
Mach64 driver bails out on ia64 because it cannot map device
memory. It turns out that some bogus and unneeded code attempts
to find the root bridge of the device and fails to do so proberly
as there this host-to-pci bridge is not existant. This code has
been around for years although it completely unclear what it had
been intended for. Fixing this by eliminating the bogus code.
(cherry picked from c1828a8ff5 commit)
2006-11-08 10:17:58 -05:00
Matthias Hopf
816b95be37 Build with -D_PC on ix86 only.
(cherry picked from 46901063e8 commit)
2006-11-08 10:17:37 -05:00
Aaron Plattner
c969c7e10c Fix standard VESA modes.
The built-in mode timings were off slightly for the 640x480@60, 640x480@72,
and 1024x768@75 modes.
(cherry picked from 97fd471a62 commit)
2006-11-08 09:56:23 -05:00
Myron Stowe
267dc25e5c xfree86: re-enable chipset-specific drivers for Linux/ia64
Re-enable chipset-specific support for Linux/ia64, by linking in
lnx_ia64.c.
(cherry picked from 794f2e7291 commit)
2006-11-08 09:53:33 -05:00
Erik Andren
b94e320205 remove XFree86 changelogs (bug #7262)
Without being able to tie these to specific commits, the text changelog is
useless, as well as being huge.
(cherry picked from 430411ae07ad74662e22da70563f757a931c72b9 commit)
2006-11-08 15:37:01 +02:00
Alan Coopersmith
f1ef85689a Fix automake error: BUILT_SOURCES was defined multiple times on Solaris
(cherry picked from c03311a1e7 commit)
2006-11-03 13:13:38 -08:00
Matthieu Herrb
00e8237839 Handle building in a separate objdir
(cherry picked from 645d057620 commit)
2006-10-29 18:20:19 +01:00
Matthieu Herrb
dabf032853 kill GNU-make'ism.
(cherry picked from 59584c375f commit)
2006-10-29 17:50:25 +01:00
Michel Dänzer
d12d0839fd Fix test for Option "IgnoreABI".
This option has plenty of potential for wasting the time of bug triagers
without pretending it's always on.
(cherry picked from becbda6d51 commit)
2006-10-25 11:41:20 +02:00
Joshua Baergen
6e73c87c53 Create xorg.conf.example (Gentoo bug #138623).
(cherry picked from 62d2409793 commit)
2006-10-24 09:18:41 -07:00
Alan Coopersmith
fe32a0eb9f Pre-release message should tell users to check git, not CVS, for updates
(cherry picked from e1dd1904c6 commit)
2006-10-19 14:28:12 -07:00
Alan Hourihane
a935222f93 Small modification to blocking signals when switching modes.
(cherry picked from d430e76a16 commit)
2006-10-16 12:39:38 +01:00
Alan Coopersmith
180e1bc979 Make sure xorgcfg files are included even when dist made with --disable-xorgcfg
(cherry picked from b9108a13fc commit)
2006-10-13 19:06:19 -07:00
Alan Hourihane
7a995802b3 Block IO on switchmode just as we do for VT switching
to avoid cursor movements signalling io.
(cherry picked from cf948b7b04 commit)
2006-10-13 14:50:33 +01:00
Brian
d3c6688781 Check for visual==NULL in dmxBECreateColormap() before calling XCreateColormap()
to prevent potential segfault.
(cherry picked from f7c1d94241 commit)
2006-10-11 16:02:00 -04:00
Brian
32c293aa1c The fbcmap.c file used by Xdmx _must_ be compiled with XFree86Server defined.
Otherwise, Xdmx generates a slew of protocol errors.
(cherry picked from 945b7c6394 commit)
2006-10-11 16:01:37 -04:00
Brian
26a94bab11 Replace broken DMXDBG3() with DMXDBG2()
(cherry picked from 891e9c3e6c commit)
2006-10-11 16:01:27 -04:00
Aaron Plattner
b84fb534fb Bug 8386: Grow parser buffers to fit an entire line if it's longer than CONFIG_BUF_LEN.
(cherry picked from c1655f0fd4 commit)
2006-10-11 16:01:08 -04:00
Drew Parsons
27f0a0066f * Install Xprint's Xsession script to $(sysconfdir)/X11/Xsession.d
* Removing outdated references to CDE and dt, rename script to
  92xprint-xpserverlist.
(cherry picked from 8b4ed47c5d commit)
2006-10-11 16:01:00 -04:00
Donnie Berkholz
0790665ff0 Really fix sparc on 64-bit kernel/32-bit userland.
Commit b3a3020fd0 used a sparc64 ifdef instead of
sparc. But for 32-bit userland, __sparc64__ is not defined so the wrong code is
used.
(cherry picked from d812f486a0 commit)
2006-10-11 16:00:34 -04:00
Adam Jackson
e862a70a38 Don't install librac.a.
Thanks, automake.
(cherry picked from f057de4f73 commit)
2006-10-11 16:00:25 -04:00
Adam Jackson
99d798d06b Merge branch 'autoconfig-for-7.2' into server-1.2-branch 2006-10-11 15:59:54 -04:00
Adam Jackson
61f3eb816b Back out merge of master to 1.2 branch. Undoes 89987ca...
Dear git: please make 'git-revert' work on merge commits kthnxbye.
2006-10-11 15:56:45 -04:00
Alan Coopersmith
4c34224630 Merge branch 'XACE-modular' 2006-10-06 18:01:13 -07:00
Alan Coopersmith
8382234a7f Update pci.ids to Tue 2006-10-03 daily snapshot 2006-10-03 17:49:48 -07:00
Alan Coopersmith
96edf7b853 Don't insert RCS tag into generated pci id header files 2006-10-03 17:48:50 -07:00
Aaron Plattner
4bc5dc2854 Merge branch 'wfb' 2006-09-28 13:27:13 -07:00
Michel Dänzer
2206a92a97 Push information about cliprects of DRI windows to the DRM. 2006-09-27 10:48:49 +02:00
Michel Dänzer
54d371e7a4 Add wrapper for new ioctl to update drawable information in the DRM. 2006-09-27 10:48:41 +02:00
Brian
f7c1d94241 Check for visual==NULL in dmxBECreateColormap() before calling XCreateColormap()
to prevent potential segfault.
2006-09-23 10:38:10 -06:00
Brian
945b7c6394 The fbcmap.c file used by Xdmx _must_ be compiled with XFree86Server defined.
Otherwise, Xdmx generates a slew of protocol errors.
2006-09-23 10:35:25 -06:00
Brian
891e9c3e6c Replace broken DMXDBG3() with DMXDBG2() 2006-09-23 10:28:24 -06:00
David Nusinow
a10039a100 Allow the xfree86 ddx utils to be optionally built. Patch by Eugene Konev. 2006-09-21 23:58:32 -04:00
Aaron Plattner
c1655f0fd4 Bug 8386: Grow parser buffers to fit an entire line if it's longer than CONFIG_BUF_LEN. 2006-09-21 14:45:17 -07:00
Drew Parsons
8b4ed47c5d * Install Xprint's Xsession script to $(sysconfdir)/X11/Xsession.d
* Removing outdated references to CDE and dt, rename script to
  92xprint-xpserverlist.
2006-09-21 22:19:44 +10:00
Donnie Berkholz
d812f486a0 Really fix sparc on 64-bit kernel/32-bit userland.
Commit b3a3020fd0 used a sparc64 ifdef instead of
sparc. But for 32-bit userland, __sparc64__ is not defined so the wrong code is
used.
2006-09-20 15:39:39 -07:00
Adam Jackson
f057de4f73 Don't install librac.a.
Thanks, automake.
2006-09-16 03:49:11 -04:00
Eamon Walsh
49a70c8570 Merge branch 'master' into my-XACE-modular 2006-09-15 15:26:57 -04:00
Adam Jackson
46af6d1e95 Always believe the monitor when it reports a reduced-blanking mode.
CVT reduced blanking modes are typically only seen on digital connections to
LCDs, but there are some monitors that report them as supported over the
VGA connector too, which is perfectly legitimate, electrically speaking.
2006-09-14 19:28:44 -04:00
Adam Jackson
63acf18b7e In xf86MatchPciInstances, fail gracefully when there's no PCI device at all.
This allows the autoconfig logic to fall through sanely on non-PCI machines,
which importantly includes Xen virtual machines.
2006-09-14 19:26:37 -04:00
Adam Jackson
a8f9936f55 Prefer driver-provided modes when matching name strings to modelines.
Well, kinda.  Strictly we prefer M_T_BUILTIN strongest since those are modes
where the driver has said it absolutely can't do anything else (VBE).  Then
we look for user-defined modes, ie, modelines from the config file.  Then
we consider modes reported by the monitor via EDID.  Finally if nothing has
matched yet we consider the default mode pool.

Within each of the above-mentioned classes, modes with the M_T_PREFERRED bit
take priority over other modes in the same class.

This logic ensures that the timings sent to the monitor exactly match the
timings it reported as supported, which occasionally don't match the numbers
you might get for that mode from CVT or GTF.
2006-09-14 19:24:41 -04:00
Adam Jackson
81ef1b6d60 Mark EDID modes as driver modes. Infer virtual size from driver modes.
This allows the server to guess an appropriate initial virtual size and
resolution.  The heuristic is to select the largest driver-reported mode
that matches the monitor's physical aspect ratio.  We revalidate this
estimate after mode validation, since we may have filtered away all
modes that would fill that size.

Also, the EDID preferred timing is now marked as M_T_PREFERRED as well.
2006-09-14 19:18:58 -04:00
Adam Jackson
43d9edd31e Attempt to add the 'mouse' driver in more situations.
Always add a mouse driver instance configured to send core events, unless
a core pointer already exists using either the mouse or void drivers.  This
handles the laptop case where the config file only specifies, say,
synaptics, which causes the touchpad to work but not the pointing stick.
We don't double-instantiate the mouse driver to avoid the mouse moving twice
as fast, and we skip this logic when the user asked for a void core pointer
since that probably means they want to run with no pointer at all.
2006-09-14 19:09:02 -04:00
Adam Jackson
739224d05e Load the default module set when no Module section is given in the config.
Also, synchronize that list with the list for the pseudoconfig file used
when starting with no config file.  These really need to be better unified.
2006-09-14 19:03:32 -04:00
Adam Jackson
beac2bf1e4 Expand the default sync ranges to be large enough for 800x600@60. 2006-09-14 19:01:13 -04:00
Adam Jackson
71a15a7d57 Publish the raw EDID block as a property on the root window.
This was removed in the patch for bug #5386, but is still useful.
2006-09-14 19:00:10 -04:00