844560a02f
Elminiate ARCH_PCI_OS_INIT.
...
Never, ever use the ix86Pci stuff on Linux. This renders the whole
ARCH_PCI_OS_INIT mechanism useless. Remove it.
2007-01-22 09:13:59 -08:00
c279d5fdc5
Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework
2007-01-19 12:59:54 -08:00
f36a447d20
Eliminate use of Tag field.
...
The Tag field was removed from the int10 structures in commit
ca9c41e09d
2007-01-16 14:49:19 -08:00
780b55ec6f
Fix accidental commit (bug) in linuxOpenLegacy.
2007-01-15 15:30:16 -08:00
31bd8d1507
Fix domain insanity.
...
Eliminate xf86GetPciDomain. The domain from libpciaccess is the
domain. Period. This means that 0 is a valid domain. Make sure that
INCLUDE_XF86_NO_DOMAIN is *not* set. Always run in "domain mode,"
even if the only domain possible is 0.
2007-01-15 15:19:30 -08:00
1c326bf75f
Eliminate unused INCLUDE_XF86_MAP_PCI_MEM define.
2007-01-12 12:07:19 -08:00
1a493509e3
Fix typos in conditionally compiled code.
2007-01-12 10:58:59 -08:00
8279444a54
Eliminate unused pciAddrHostToBus infrastructure.
2007-01-12 10:41:03 -08:00
e32fa10a04
Remove prototype for pciGetBaseSize.
2007-01-12 10:33:17 -08:00
7411f5c389
Eliminate pciHostAddrToBusAddr from interface.
...
pciHostAddrToBusAddr is no longer used anywhere in the tree. Remove
it with extreme prejudice.
2007-01-12 10:32:04 -08:00
c3016a2996
Missed file from previous commit.
...
Convert xf86ReadLegacyVideoBIOS to take a 'struct pci_device *'
parameter instead of a PCITAG.
2007-01-12 09:56:00 -08:00
ca9c41e09d
Convert int10 and vgaHW to use 'struct pci_device' instead of PCITAG.
...
Convert all uses of PCITAG in int10 and vgaHW to 'struct pci_device'.
This allows the conversion of xf86ReadLegacyVideoBIOS and
xf86MapDomainMemory to 'struct pci_device' from PCITAG.
2007-01-11 21:09:20 -08:00
78f9592c11
lnx_ev56.c has to be built with -mcpu=ev56. Fix it.
2007-01-10 16:04:20 +00:00
da09964a93
Merge branch 'origin' into pci-rework
...
Conflicts:
hw/xfree86/int10/generic.c
2007-01-09 15:27:34 -08:00
b88ad820fa
Set Int10Current->Tag for the linux native int10 module
...
Fixes bug #9296
(cherry picked from 731952c561a3972d09d1315f4fd31466e459ccb9 commit)
2006-12-13 12:18:22 +00:00
e1f73d2208
Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework
...
Conflicts:
hw/xfree86/common/xf86Configure.c
hw/xfree86/common/xf86Helper.c
hw/xfree86/common/xf86pciBus.c
hw/xfree86/int10/helper_exec.c
hw/xfree86/os-support/bus/Pci.c
hw/xfree86/os-support/bus/linuxPci.c
hw/xfree86/os-support/linux/lnx_pci.c
hw/xfree86/scanpci/Makefile.am
hw/xfree86/utils/pcitweak/Makefile.am
hw/xfree86/utils/scanpci/Makefile.am
2006-12-08 17:24:15 -08:00
82912ad770
Make solaris version of xf86OSRingBell return void like other OS'es
2006-11-30 20:13:52 -08:00
b4b0d901d9
Merge branch 'randr-1.2'
...
Conflicts:
dix/events.c
dix/getevents.c
hw/xfree86/common/xf86Mode.c
hw/xfree86/dri/Makefile.am
hw/xfree86/os-support/drm/xf86drm.c
hw/xfree86/os-support/xf86drm.h
2006-11-27 15:43:15 -08:00
ae3c9ad4ab
Bug 9041: Check the return code in xf86MapDomainMemory().
2006-11-16 17:29:06 +01:00
6ff7f2ad6a
Fix build on FreeBSD after input-hotplug.
...
(cherry picked from commit 4e6e4baead
2006-11-15 15:35:22 -08:00
5bfe7f4dfc
DRI: call drmSetServerInfo() before drmOpen().
...
Also, remove some libdrm remnants.
2006-11-13 01:54:32 +02:00
28337cc106
Fix typo before the last commit.
2006-11-09 19:51:17 -08:00
e1720b1089
Bug #8868 : Remove drm from SUBDIRS now that the directory is gone.
2006-11-09 18:53:37 -08:00
fd91630b73
make X server use system libdrm - this requires libdrm >= 2.3.0
...
This patch blacklists the load "drm" line, moves some functions in dri module
links dri module against libdrm, and removes the X copy of libdrm
2006-11-09 09:30:33 +11:00
0567a6337b
xfree86/linux acpi: fix tokenising
...
Split on a space, rather on the 'video' string, as strtok takes a char,
not a string.
2006-11-08 18:00:52 +02:00
809e2841aa
xfree86: add general handler, port ACPI to it (bug #5665 )
...
Add 'general' handler registration, which will not trigger DPMS when an
event comes in.
Make ACPI use this.
2006-11-08 15:30:03 +02:00
61b570d0c1
xfree86/os-support: update prototype for OSRingBell
2006-11-08 15:29:15 +02:00
4e6e4baead
Fix build on FreeBSD after input-hotplug.
2006-11-07 13:36:54 -08:00
20e9144c07
Add $(DIX_CFLAGS) to remaining Makefile.am files
2006-11-07 12:49:28 -08:00
028bbdc041
Merge master back to randr-1.2
2006-11-04 17:46:26 -08:00
8b87ce1974
Allow X server to build against libdrm 2.1
2006-11-04 17:41:25 -08:00
8deaaa312a
automake: avoid use of reserved _SOURCES keyword (bug #8866 )
...
Avoid using _SOURCES unless we're directly referencing a program or
library to be built; use _SRCS instead. Shuts automake 1.10 up.
2006-11-04 19:08:28 +02:00
f72927d26c
xfree86/hurd: remove OsMouseProc (bug #5613 )
...
Remove OsMouseProc, let the mouse driver deal with it.
2006-11-04 19:08:27 +02:00
0273610578
xfree86/hurd: add bell support, remove SERVER/LOADER defines (bug #5613 )
...
Add no-op bell ringing support, and remove obsolete @SERVER_DEFINES@ and
@LOADER_DEFINES@ from CFLAGS.
2006-11-04 19:08:25 +02:00
bd0c829654
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.
2006-11-03 18:59:52 +01:00
c1828a8ff5
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.
2006-11-03 18:59:52 +01:00
d50fc413b3
Fix device path in altixPCI.c to be domain aware.
2006-11-03 18:59:52 +01:00
1d731fc54a
Add domain support to linuxPciOpenFile().
...
Loosely based on patch from David S. Miller <davem@davemloft.net>
See also bug #2368 .
2006-11-03 18:59:51 +01:00
caaa113acf
Fixing domain support for ia64
...
ia64 specific functions + defines.
Still uses /proc interface for some scaning code.
Based on code from Egbert Eich <eich@freedesktop.org>.
2006-11-03 18:59:51 +01:00
072c022e73
Fix obviously wrong boundary checks + cleanup unused vars.
...
Also disable compilation of code that is no longer used anywhere in the whole
Xserver tree.
2006-11-03 18:59:51 +01:00
5afc6c1a14
Added linux 2.6 compatible domain aware device scanning code.
...
Additional scanning code uses the /sys interface of 2.6 kernels.
Cleaned up the use of tags and already split domain/bus/dev/fn.
2006-11-03 18:59:51 +01:00
f4dd2665b0
Added missing domain stripping in already domain aware code.
2006-11-03 18:59:51 +01:00
543b397277
Merge branch 'origin' into randr-1.2
2006-11-02 19:00:35 -08:00
7dc54a40e9
Remove references to xf86Info.kbd* from solaris code
2006-11-02 16:38:47 -08:00
e46f7f78b3
sun_bell.c needs to #include "xf86_OSlib.h"
2006-11-02 16:38:12 -08:00
01afa533aa
xfree86/os-support: axe more unused files
2006-11-02 04:32:37 +02:00
57c1409151
xfree86/os-support: remove unused file from dist
2006-11-02 04:21:06 +02:00
18c246a13b
Merge branch 'input-hotplug'
2006-11-02 03:21:37 +02:00
be291a6d97
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
2006-11-02 03:15:25 +02:00
81728558a0
input: add non-keyboard bell ringing function
...
Add a generic 'ring the bell' function (console bell on Linux and BSD,
/dev/audio on Solaris), and add DDX functions for this. Make this the
core keyboard's bell.
Port Xvfb and Xnest to this.
Port XFree86 to this, with OS-specific hooks for Linux, BSD, and Solaris
taken from foo_io.c in the old layer.
2006-11-01 23:10:26 +02:00
Ian Romanick
Alan Hourihane
Alan Coopersmith
Eric Anholt
Bjorn Helgaas
George Sapountzis
Dave Airlie
Bram Verweij
Daniel Stone
Keith Packard
Bernhard Rosenkraenzer
Samuel Thibault
Egbert Eich
Matthias Hopf