andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4,428 Commits 86 Branches 473 Tags 48 MiB
6216abe0c1
Commit Graph

360 Commits

Author SHA1 Message Date
Peter Hutterer
43bd35fcf8 dix: Remove InitSprite, work can be done by InitializeSprite. 
Free sprite struct if a spriteOwner is paired.

xfree86: Use PairDevices instead of passing booleans around when creating a
         sprite.

Xext:    Switch back to using LookupPointer/KeyboardDevice instead of
         inputInfo.xyz.
 2007-03-01 17:19:37 +10:30
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