andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
7,110 Commits 86 Branches 473 Tags 48 MiB
40877c6680
Commit Graph

451 Commits

Author SHA1 Message Date
Eamon Walsh
c3f7b86255 Merge branch 'master' into XACE-SELINUX 
Conflicts:

	os/access.c
 2007-10-17 15:00:54 -04:00
Ben Byer
3d4eb17b38 mass change from #ifdef i386 to #ifdef __i386__ to conform to ANSI 2007-10-14 18:07:03 -07:00
Alan Coopersmith
62a9fb4cda Fix PCI rework build on Solaris (copy what BSD does) 2007-09-27 16:47:32 -07:00
Alan Coopersmith
1d938a80fd Remove unused pciAddrHostToBus functions from ix86Pci.c 
Matches linuxPci.c changes made in 8279444a54
Fixes compiler errors:
 "ix86Pci.c", line 194: too many struct/union initializers
 "ix86Pci.c", line 204: too many struct/union initializers
 "ix86Pci.c", line 214: too many struct/union initializers
 2007-09-26 19:42:46 -07:00
Eamon Walsh
97c150b61b Merge branch 'master' into XACE-SELINUX 
Conflicts:

	afb/afbpntwin.c
	afb/afbscrinit.c
	afb/afbwindow.c
	cfb/cfb.h
	cfb/cfballpriv.c
	cfb/cfbscrinit.c
	cfb/cfbwindow.c
	configure.ac
	fb/wfbrename.h
	hw/xfree86/xf4bpp/ppcIO.c
	hw/xfree86/xf4bpp/ppcPntWin.c
	hw/xfree86/xf4bpp/ppcWindow.c
	hw/xfree86/xf8_32bpp/cfbscrinit.c
	mfb/mfb.h
	mfb/mfbpntwin.c
	mfb/mfbscrinit.c
	mfb/mfbwindow.c
	mi/miexpose.c

Note: conflicts caused by devPrivates rework vs. paintwindow changes.
 2007-09-19 07:25:55 -04:00
Eric Anholt
d8ab2353cb Remove dead xf86GetPciSizeFromOS and xf86GetPciOffsetFromOS. 2007-08-30 11:26:17 -07:00
Eric Anholt
c2d80529fc Remove the now-dead PciAvoid symbol. 2007-08-30 11:26:17 -07:00
Eric Anholt
adf46b57ce Replace BSD custom PCI code with a stub implementation thanks to pciaccess. 
Note that pciaccess doesn't yet have Net/OpenBSD support, but the relevant
code should go there instead of disconnected code in the X Server.

While here, remove the now-disabled INCLUDE_XF86_NO_DOMAIN from the headers,
and un-disable xf8StdAccResFromOS for those OSes without domain support which
will need it.
 2007-08-28 10:13:27 -07:00
Eamon Walsh
4017d31902 devPrivates rework: since API is already broken, switch everything 
over to new system.

Need to update documentation and address some remaining vestiges of
old system such as CursorRec structure, fb "offman" structure, and
FontRec privates.
 2007-08-28 09:28:25 -04:00
Eric Anholt
3fe67d23ed Remove the BusAccWindows resource code which is now unused. 
This was a bunch of poorly defined resource ranges per OS/platform combination
which were supposed to represent what regions could potentially have resources
allocated into them.
 2007-08-27 19:02:41 -07:00
Ian Romanick
8b6b40b727 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 
Conflicts:

	hw/xfree86/common/xf86.h
	hw/xfree86/common/xf86Init.c
	hw/xfree86/common/xf86pciBus.c
	hw/xfree86/int10/generic.c
	hw/xfree86/int10/helper_exec.c
	hw/xfree86/loader/xf86sym.c
	hw/xfree86/os-support/bus/Pci.c
	hw/xfree86/os-support/bus/Pci.h
	hw/xfree86/os-support/bus/linuxPci.c
	hw/xfree86/os-support/linux/int10/linux.c
 2007-08-23 18:19:17 -07:00
Adam Jackson
1834cfb447 Fix an error message to not point to @xfree86.org. 2007-08-21 10:44:37 -04:00
Julien Cristau
a1fe36b772 xfree86: Fix build on Linux/alpha. 
A bunch of CFLAGS had gone missing, so the build failed with errors like:
../../../../../hw/xfree86/os-support/linux/lnx_ev56.c:7:19: error: input.h: No such file or directory
../../../../../hw/xfree86/os-support/linux/lnx_ev56.c:8:24: error: scrnintstr.h: No such file or directory
 2007-08-21 00:26:33 +02:00
Blair Sadewitz
65a49f0ca1 Autoconfiguration of wsmouse for NetBSD. 2007-08-19 20:29:22 +02:00
Jeremy C. Reed
be536b79f2 Update for support on NetBSD and DragonFly. From 
Joerg Sonnenberger and pkgsrc.
 2007-08-16 11:23:28 -05:00
Jeremy C. Reed
1d4bea6106 Add some more support for DragonFly. From Joerg Sonnenberger 
and pkgsrc.
 2007-08-16 11:20:12 -05:00
Samuel Thibault
03f9da6724 xfree86: Improve default mouse handling on the Hurd 
Make /dev/mouse the default device.  This makes Xorg works with empty
or missing InputDevice sections.
 2007-08-12 03:08:49 +02:00
Dave Airlie
e717eb82dc xserver: stop bcopy from going really slow 
The outport is most likely unnecessary on any currently used hardware,
the byte copy is necessary from what I know on IA64 and friends so leave it.

Add a new API entry point which lets a driver select the old behaviour if
such a needs is ever found.

This gives me ~20% speed up on startup on 945 hardware.
 2007-08-05 09:51:36 +10:00
Daniel Stone
1150969b82 Convert all my license statements to the standard form 
Convert all my license statements to the standard, accepted form:
cf. <20070717142307.GD13478@fooishbar.org>
    http://lists.freedesktop.org/archives/xorg/2007-July/026451.html

keithp's license on configure.ac changed with his verbal permission.
 2007-08-01 01:53:31 +03:00
Adam Jackson
f62beb6f36 Remove all trace of Option "BiosLocation". 
This code was deeply dangerous.  If anyone actually had a use for this code,
we should find a better way of doing it.
 2007-07-27 13:24:38 -04:00
Julien Cristau
0f91abd5c6 Fix alpha build failures 
Don't include <asm/pci.h> in os-support/linux/lnx_axp.c, use "lnx.h" and
<unistd.h> instead
 2007-07-19 20:37:26 -04:00
Alan Coopersmith
9fcb30ebf7 Make SOLARIS_INOUT_ARCH substitutions work better with automake-1.10 2007-07-12 13:00:32 -07:00
Jonathan Lim
16e429bcbf Bug 5000: Fix domain support for SGI Altix 2007-07-04 20:08:49 +02:00
Adam Jackson
4d76075dbb Death to RCS tags. 2007-06-29 14:06:52 -04:00
Adam Jackson
f7f3fe7fe7 Remove the remnants of OS/2 support. 
This has never worked in any modular server release, and as far as I know
was never tested in 6.7 through 6.9.
 2007-06-28 18:59:05 -04:00
Adam Jackson
8a06ff9ffa Fix another usage of MAX_PCI_DEVICES. 
Fixes cases where the VGA device is above the 128th device on the system.
 2007-06-28 16:41:28 -04:00
Ian Romanick
ab7a6d860d Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 
Conflicts:

	hw/xfree86/os-support/bus/Pci.c
	hw/xfree86/os-support/bus/linuxPci.c
 2007-06-18 16:51:13 -07:00
Adam Jackson
2e7fef7d08 Make xf86{En,Dis}ableInterrupts no-ops on Linux. 2007-06-18 12:08:39 -04:00
Lennart Buytenhek
831d3b7f8d Compile fixes for Linux ARM platforms. 2007-06-18 12:05:55 -04:00
Samuel Thibault
99eae8bea6 I/O enable/disable update for the Hurd 2007-05-29 22:04:36 -04:00
Matthieu Herrb
60de6c7ef9 Merge branch 'master' of ssh://herrb@git.freedesktop.org/git/xorg/xserver 2007-05-29 12:14:49 -06:00
Matthieu Herrb
3a6549a163 Make this build on OpenBSD 2007-05-29 12:14:23 -06:00
Bastian Blank
2267bf48b3 Fixes for s390 2007-05-28 21:55:05 -04:00
David Nusinow
6bf8d50193 Read ROM in chunks 
This patch speeds up reads of the ROM by reading in large chunks rather
than one byte at a time. This patch was by Dann Frazier.
 2007-05-28 21:42:10 -04:00
Matthias Drochner
9616a04285 Fix build on NetBSD/amd64. 2007-05-24 11:20:59 -07:00
Matthias Hopf
ebaa6c920c Disable Simba PCI bridge routing code (Bug #8020). 
The code in hw/xfree86/os-support/bus/sparcPci.c:simbaCheckBus()
is trying to mimmick VGA routing by disabling I/O space responses
behind the Simba PCI-PCI controller.

Unfortunately, doing this also happens to disable access to the
IDE controller I/O space registers, thus crashing the system.  The
granularity of the I/O disabling in the Simba controller is not
fine enough to disable VGA without also disabling the IDE controller
registers.
 2007-05-10 15:25:31 +02:00
Adam Jackson
d322608dc9 Fix a buffer overrun on machines with excessively large PCI busses. 
Formerly we sized an array with a compile time constant, then initialized
its size to the same constant, but the Linux PCI init code would increase
that "constant".  So if you happened to have more than 128 PCI devices,
you'd happily scribble into whatever variables happened to be in .bss
after that array.

Only really fixed for Linux atm.  Other OSes will simply (still) fail to
work on video devices above the 128th PCI device.
 2007-04-25 16:29:48 -04:00
Jared D. McNeill
4aae2de74b Add a real xf86EnableIO/xf86DisableIO for NetBSD/PPC. 2007-04-10 12:57:15 -07:00
Adam Jackson
67e1c98895 Look for the PCI ROM file elsewhere in sysfs. 
/sys/devices reflects the bus topology, and we don't care that much.
Easier (and more reliable) to just look in /sys/bus/pci/devices, which
is a flat view.
 2007-04-09 19:08:52 -04:00
Adam Jackson
a08d5157f7 VT activate or waitactive are fatal if they fail. 
Also, be sure to waitactive on the way down, to make sure we're off the VT
before exiting.
 2007-04-09 19:04:56 -04:00
Ian Romanick
2c6d471088 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 
Conflicts:

	hw/xfree86/Makefile.am
	hw/xfree86/dri/dri.c
 2007-03-28 08:08:04 -07:00
Adam Jackson
62224e3972 Static cleanup for xf86 ddx. 2007-03-25 17:55:15 -04:00
Jay Cotton
90ca76ba28 Add sun_apm.c for Suspend-and-Resume support on Solaris 
<http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6205248>
 2007-02-28 17:40:58 -08:00
Alan Coopersmith
5680efc0d2 Sun bug 6529003: Xorg should not be including <sys/immu.h> on Solaris 
<sys/immu.h> was removed from the latest Solaris Nevada build, but it's
been useless to Xorg for a long time (it only declared a couple of kernel
variables)
<http://bugs.opensolaris.org/view_bug.do?bug_id=6529003>
 2007-02-27 09:56:40 -08:00
Jay Estabrook
a16360733e Fix root bus/domain selection on alpha 2007-02-25 21:00:25 +00:00
Ian Romanick
c4fe1bcce1 Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework 2007-02-14 15:39:52 -08:00
Ian Romanick
e540d572c5 Merge fix missed on previous commit. 2007-02-14 15:38:10 -08:00
Adam Jackson
a23b0b069c Typo fix. 2007-02-12 17:50:00 -05:00
Ian Romanick
3814862a86 Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework 
Conflicts:

	hw/xfree86/os-support/bus/linuxPci.c
 2007-01-29 15:14:31 -08:00
Jonathan Lim
1627af5449 Call linuxPciOpenFile() for r/w access if applicable. 
Currently, the call to linuxPciOpenFile() is always made for read
only access which causes the subsequent mmap call to fail when the
memory is mapped read/write.

Xorg #9692
 2007-01-26 13:00:45 +01:00
Ian Romanick
24506ea65b Move xf86ReadLegacyBIOS to the one place that uses it. 
xf86ReadLegacyBIOS is only used by one function in int10/generic.c.
Move a generic implementation of that function there, rename it to
read_legcay_BIOS, and delete all remnants of it from all other places.
 2007-01-24 15:33:49 -08:00
Ian Romanick
637b19b3ee Eliminate pciControlBridge, pciGetBridgeBuses, and pciGetBridgeResources. 2007-01-22 09:58:33 -08:00
Ian Romanick
a232e4ae93 Convert xf86GetPciHostConfigFromTag to get_parent_bridge. 
Convert xf86GetPciHostConfigFromTag to a new function called
get_parent_bridge.  This name better represents what
xf86GetPciHostConfigFromTag is used for:  walking up the lists of PCI
bridges from a device.
 2007-01-22 09:16:45 -08:00
Ian Romanick
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
Ian Romanick
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
Ian Romanick
f36a447d20 Eliminate use of Tag field. 
The Tag field was removed from the int10 structures in commit
ca9c41e09d.  This file was over looked.
 2007-01-16 14:49:19 -08:00
Ian Romanick
780b55ec6f Fix accidental commit (bug) in linuxOpenLegacy. 2007-01-15 15:30:16 -08:00
Ian Romanick
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
Ian Romanick
1c326bf75f Eliminate unused INCLUDE_XF86_MAP_PCI_MEM define. 2007-01-12 12:07:19 -08:00
Ian Romanick
1a493509e3 Fix typos in conditionally compiled code. 2007-01-12 10:58:59 -08:00
Ian Romanick
8279444a54 Eliminate unused pciAddrHostToBus infrastructure. 2007-01-12 10:41:03 -08:00
Ian Romanick
e32fa10a04 Remove prototype for pciGetBaseSize. 2007-01-12 10:33:17 -08:00
Ian Romanick
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
Ian Romanick
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
Ian Romanick
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
Alan Hourihane
78f9592c11 lnx_ev56.c has to be built with -mcpu=ev56. Fix it. 2007-01-10 16:04:20 +00:00
Ian Romanick
da09964a93 Merge branch 'origin' into pci-rework 
Conflicts:

	hw/xfree86/int10/generic.c
 2007-01-09 15:27:34 -08:00
Alan Hourihane
b88ad820fa Set Int10Current->Tag for the linux native int10 module 
Fixes bug #9296
(cherry picked from 731952c561 commit)
 2006-12-13 12:18:22 +00:00
Ian Romanick
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
Alan Coopersmith
82912ad770 Make solaris version of xf86OSRingBell return void like other OS'es 2006-11-30 20:13:52 -08:00
Eric Anholt
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
Bjorn Helgaas
ae3c9ad4ab Bug 9041: Check the return code in xf86MapDomainMemory(). 2006-11-16 17:29:06 +01:00
Eric Anholt
6ff7f2ad6a Fix build on FreeBSD after input-hotplug. 
(cherry picked from commit 4e6e4baead)
 2006-11-15 15:35:22 -08:00
George Sapountzis
5bfe7f4dfc DRI: call drmSetServerInfo() before drmOpen(). 
Also, remove some libdrm remnants.
 2006-11-13 01:54:32 +02:00
Eric Anholt
28337cc106 Fix typo before the last commit. 2006-11-09 19:51:17 -08:00
Eric Anholt
e1720b1089 Bug #8868: Remove drm from SUBDIRS now that the directory is gone. 2006-11-09 18:53:37 -08:00
Dave Airlie
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
Bram Verweij
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
Daniel Stone
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
Daniel Stone
61b570d0c1 xfree86/os-support: update prototype for OSRingBell 2006-11-08 15:29:15 +02:00
Eric Anholt
4e6e4baead Fix build on FreeBSD after input-hotplug. 2006-11-07 13:36:54 -08:00
Keith Packard
20e9144c07 Add $(DIX_CFLAGS) to remaining Makefile.am files 2006-11-07 12:49:28 -08:00
Keith Packard
028bbdc041 Merge master back to randr-1.2 2006-11-04 17:46:26 -08:00
Keith Packard
8b87ce1974 Allow X server to build against libdrm 2.1 2006-11-04 17:41:25 -08:00
Bernhard Rosenkraenzer
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
Samuel Thibault
f72927d26c xfree86/hurd: remove OsMouseProc (bug #5613) 
Remove OsMouseProc, let the mouse driver deal with it.
 2006-11-04 19:08:27 +02:00
Samuel Thibault
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
Bjorn Helgaas
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
Egbert Eich
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
Matthias Hopf
d50fc413b3 Fix device path in altixPCI.c to be domain aware. 2006-11-03 18:59:52 +01:00
Matthias Hopf
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
Matthias Hopf
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
Matthias Hopf
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
Matthias Hopf
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
Matthias Hopf
f4dd2665b0 Added missing domain stripping in already domain aware code. 2006-11-03 18:59:51 +01:00
Keith Packard
543b397277 Merge branch 'origin' into randr-1.2 2006-11-02 19:00:35 -08:00
Alan Coopersmith
7dc54a40e9 Remove references to xf86Info.kbd* from solaris code 2006-11-02 16:38:47 -08:00
Alan Coopersmith
e46f7f78b3 sun_bell.c needs to #include "xf86_OSlib.h" 2006-11-02 16:38:12 -08:00
Daniel Stone
01afa533aa xfree86/os-support: axe more unused files 2006-11-02 04:32:37 +02:00
Daniel Stone
57c1409151 xfree86/os-support: remove unused file from dist 2006-11-02 04:21:06 +02:00
Daniel Stone
18c246a13b Merge branch 'input-hotplug' 2006-11-02 03:21:37 +02:00
Daniel Stone
be291a6d97 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug 2006-11-02 03:15:25 +02:00
Daniel Stone
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
Thomas Hellstrom
06b6b971d0 Make sure we have 64-bit file-offsets in libdrm. 2006-10-29 15:22:37 +01:00
Thomas Hellstrom
92d04e746b Import libdrm functions for the drm memory manager. 2006-10-27 18:26:30 +02:00
Myron Stowe
794f2e7291 xfree86: re-enable chipset-specific drivers for Linux/ia64 
Re-enable chipset-specific support for Linux/ia64, by linking in
lnx_ia64.c.
 2006-10-26 20:38:58 +03:00
Keith Packard
59511974db Merge branch 'master' into randr-1.2 2006-10-24 17:26:20 -07:00
Ian Romanick
27d682fa03 Fix from HEAD accidentally reverted during merge. 2006-10-24 09:04:14 -07:00
Ian Romanick
8b90913566 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 
Conflicts:

	hw/xfree86/Makefile.am
	hw/xfree86/common/xf86.h
	hw/xfree86/common/xf86DoScanPci.c
	hw/xfree86/os-support/bus/linuxPci.c
	hw/xfree86/scanpci/extrapci.ids
	hw/xfree86/scanpci/pci.ids
	hw/xfree86/scanpci/pciid2c.pl
	hw/xfree86/scanpci/xf86PciStdIds.h
 2006-10-24 08:57:59 -07:00
Daniel Stone
335b503c5e Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug 2006-10-13 18:10:45 +03:00
Matthias Hopf
1b94c117e0 Fixing probably long-standing bug in domain support. 2006-10-10 19:37:22 +02:00
Keith Packard
b4659faf9b Merge branch 'master' into randr-1.2 2006-10-04 14:46:04 -07:00
Daniel Stone
518db35ca3 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug 2006-09-29 00:35:21 +03: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
Daniel Stone
ad321fad4b Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug 2006-09-24 17:56:43 +03: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
Keith Packard
2be1ac15ae Remove smashing of CFLAGS from server build. 
CFLAGS is a user variable, extracted from the environment at configure time
and settable by the user at build time. We must not override this variable.
 2006-09-18 12:11:18 -07:00
Jesse Barnes
b3a3020fd0 the new PCI mapping routines are broken on sparc64 (in fact they look 
broken for any 32 bit X server running on a 64 bit kernel) so #ifdef
them out for now.  the PCI rework tree will make all this crap go away,
so I think we can tolerate the extra #ifdef for the next release.
 2006-09-10 11:13:18 -07:00
Ian Romanick
21291d6ca7 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 2006-08-25 09:34:21 -07:00
Daniel Stone
d6433be3cc Merge branch 'master' into input-hotplug 2006-08-12 21:50:52 +03:00
Bastian Blank
f7919c2879 xfree86: don't do legacy IO on ARM or S/390 (Debian #362641) 
Don't attempt to poke legacy IO ranges on ARM or S/390.
 2006-08-12 20:43:25 +03:00
Daniel Stone
59dcc62906 xfree86: remove Xqueue support completely 2006-08-12 20:39:08 +03:00
Samuel Thibault
e641000b98 xfree86: add Hurd support (#5613) 
Add support for GNU/Hurd.
 2006-08-12 19:41:59 +03:00
Daniel Stone
008aa7eb6e completely remove OS keyboard layer 
Completely axe the keyboard layer from os-support.
 2006-08-12 18:56:05 +03:00
Ian Romanick
5508f7646f Remove prototypes from some functions that were previously removed. 2006-08-08 16:43:31 -07:00
Ian Romanick
9df53d903e Rename xf86ReadDomainMemory to xf86ReadLegacyVideoBIOS, since that's 
what it is actually used for.  Modify a few routines in linuxPci.c to
take pci_device structures as parameters in stead of PCITAGs.
 2006-08-08 16:42:23 -07:00
Ian Romanick
5bfb2ee965 Remove the last remants of the pci{Read,Write}{Long,Word,Byte} 
functionality.  This also allows the removal of PCI_CPU, PCI_CPU16,
and a few other dangling bits of cruft.
 2006-08-02 13:29:21 -07:00
Ian Romanick
23f44df900 Remove pciConfigPtr and all of the associated cruft. 2006-08-02 09:55:32 -07:00
Ian Romanick
a94176627c Eliminate all uses of the businfo field of pciDevice / pciConfigPtr. 2006-07-31 14:33:58 -07:00
Ian Romanick
28ba8d5691 Gut anything having to do with the PciBusPtr (or PciBusRec) type. 
Bump required version of libpciaccess to 0.5.0 so that
pci_device_get_bridge_buses can be used.
 2006-07-25 15:38:09 -07:00
Ian Romanick
380b51d605 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 
Conflicts:

	hw/xfree86/common/xf86Init.c
	hw/xfree86/int10/pci.c
	hw/xfree86/scanpci/xf86PciData.h
	hw/xfree86/scanpci/xf86PciStdIds.h
	hw/xfree86/scanpci/xf86PciStr.h
	hw/xfree86/scanpci/xf86ScanPci.h
	hw/xfree86/utils/pcitweak/pcitweak.c
	hw/xfree86/utils/scanpci/scanpci.c

Re-removed most of the conflicting files.
 2006-07-25 11:30:04 -07:00
Ian Romanick
2fd6b995ff Global s/xf86MapDomainIO/xf86MapLegacyIO/. Let's call a duck a duck, 
okay?  Since xf86MapLegacyIO is called from only one place, cut the
parameter list down to the one parameter that actually conveys some
information:  the one that gives a PCI device.  Change from using a
PCITAG to a pci_device.
 2006-07-24 13:33:34 -07:00
Ian Romanick
aed6fe0bb1 Refactor linuxGetSizesStruct to take a pci_device pointer instead of a 
PCITAG.  Modify xf86BusAccWindowsFromOS and xf86AccResFromOS to call
linuxGetSizesStruct directly with a pci_device pointer.  Remove
linuxGetSizes.
 2006-07-24 13:13:05 -07:00
Ian Romanick
e487627992 Modify xf86BusAccWindowsFromOS and xf86AccResFromOS to use the 
libpciaccess interfaces.
 2006-07-24 12:23:23 -07:00
Ian Romanick
4b474cbc1a The functions xf86PciBusAccWindowsFromOS and xf86BusAccWindowsFromOS 
are identical.  Just have one call the other.
 2006-07-24 12:17:27 -07:00
Ian Romanick
525257eb98 Fix stupid typos. 2006-07-21 19:16:38 -07:00
Ian Romanick
e18d34f423 Make the various implementations of xf86ExtendedInitInt10 use the 
libpciaccess interfaces.  This eliminates all calls to mapPciRom,
which in turn allows the elimination of hw/xfree86/int10/pci.c.
 2006-07-21 16:47:45 -07:00
Daniel Stone
e7ac27ad81 revert accidental deletion of lnx_io.c; re-delete lnx_kbd.c 
Thinko'd which file to remove after merging from master.
 2006-07-21 19:29:28 -04:00
Daniel Stone
81913a1291 remove undead files from master 
Remove dead files which worked their way back in when merging from master.
Ugh.
 2006-07-21 19:10:26 -04:00
Daniel Stone
7465010d59 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug 2006-07-21 19:05:41 -04:00
Ian Romanick
07ad92d2c4 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 
Conflicts:

	hw/xfree86/common/xf86DoScanPci.c
	hw/xfree86/common/xf86Init.c
	hw/xfree86/common/xf86pciBus.c
 2006-07-21 15:25:35 -07:00
Adam Jackson
0aaac95b0d Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
Kristian Høgsberg
3eeb62e8f5 bug #890: completely remove deprecated keyboard driver 
Remove all remnants of the old built-in keyboard driver.
 2006-07-21 16:33:28 -04:00
Ian Romanick
2f98841fde Remove unused variable. 2006-07-20 16:08:27 -07:00
Ian Romanick
c69c00d652 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver 2006-07-20 12:08:38 -07:00
Daniel Stone
84683f19b4 get rid of XFree86LOADER, XFree86Server, XFree86Module, and IN_MODULE 
Get rid of almost all uses of these definitions.  They're still defined for
delinquent out-of-tree drivers, and also for the Mesa build.  As well as
for miinitext.c.  But largely gone.
 2006-07-18 18:17:38 -04:00
Adam Jackson
881953813c Fix the Linux ACPI reopen code to use a repeating timer, rather than a 
one-shot sleep-and-reopen attempt.
 2006-07-17 13:50:38 -04:00
Ian Romanick
d3ee49bcba Refactor common code from the generic.c and linux.c version of 
xf86ExtendedInitInt10 to xf86int10GetBiosLocationType and
xf86int10GetBiosSegment.

These changes were tested on MGA hardware on x86-64 with various
combinations of InitPrimary and BiosLocation.
 2006-07-14 15:13:35 -07:00
Ian Romanick
8793c7fd4b Refactor identical xf86InitInt10 function from generic.c and linux.c 
to helper_exec.c.
 2006-07-14 09:11:39 -07:00
Ian Romanick
18624a9b7c Modify linuxGetSizesStruct to use pci_device instead of pciConfigPtr. 2006-07-13 21:10:48 -07:00