Ian Romanick
26c9587f90
Build fixes for last pull from HEAD.
2006-07-31 13:54:36 -07:00
Ian Romanick
65dc25d8f8
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
2006-07-31 12:30:30 -07:00
Ian Romanick
b74c845a12
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
2006-07-31 10:26:06 -07:00
Ian Romanick
3112a6c4f2
Noting uses libdummy.a, so don't build it. Only libdummy-nonserver.a
...
is actually used.
2006-07-31 10:25:31 -07:00
Matthew Allum
02daa6bb10
Improve XRes to;
...
- Better estimate general pixmap memory usage.
- Account for pixmaps shared between clients.
- Account for window background and border pixmaps,
and GC stripple and tile pixmaps.
2006-07-31 17:32:05 +01:00
Ian Romanick
69533fc04f
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
...
Conflicts:
hw/xfree86/Makefile.am
hw/xfree86/common/xf86AutoConfig.c
2006-07-31 09:26:04 -07:00
Daniel Stone
24051ef974
remove filename that's too long for tar
2006-07-30 12:15:33 +03:00
Daniel Stone
ecb7d43a76
add sym.h to sources
2006-07-30 11:52:41 +03:00
Daniel Stone
bf2d7499c8
add securitysrv.h
2006-07-30 11:17:02 +03:00
Daniel Stone
e87e68634d
remove .cvsignores from EXTRA_DIST
2006-07-30 11:11:59 +03:00
Daniel Stone
ed0c807de9
bump to 1.1.99.3
2006-07-30 11:08:54 +03:00
Daniel Stone
a68dc013a3
remove README (which doesn't exist) from EXTRA_DIST
2006-07-30 11:08:47 +03:00
Kevin E Martin
654619d76c
Revert xkb changes that broke XkbGetKeyboard()
2006-07-28 17:16:32 -04:00
Luc Verhaegen
79016d4036
Bug #5386 (partial): Move CVT mode generator from cvt(1) to server core, and
...
export it from the X server to modules.
2006-07-28 16:02:02 -04:00
Adam Jackson
2a4ceb09ed
Remove dead function prototypes.
2006-07-26 19:39:17 -04:00
Adam Jackson
990a400905
Remove getconfig horrorshow. Replace with a static built-in rule list for now.
2006-07-26 19:03:39 -04:00
Adam Jackson
39158e98ac
Remove another latent PowerMAX hunk.
...
All your favorite running jokes of 2005, today!
2006-07-26 18:39:28 -04:00
Ian Romanick
ef1aecaaf6
Pass correct pointer to xf86MapLegacyIO.
2006-07-26 13:25:13 -07:00
Kristian Høgsberg
3821f6aeaa
Unlibc-wrap DMX glxscreens.c and fix tag-removal typo.
2006-07-26 01:56:02 -04: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
82f6b7e75e
Don't re-look-up pointers that are already stored in structures.
2006-07-24 13:52:58 -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
7dff8d98a9
Remove source files that have been dead since day-1 of this branch.
2006-07-24 11:56:37 -07:00
Ian Romanick
eb95128f61
Changes that were missed on the previous commit. Perhaps oddness
...
caused by doing git-update-index at the wrong time.
2006-07-24 11:53:37 -07:00
Ian Romanick
05f8b772ae
ScanPciDisplayPCICardInfo now uses pci_device interface for PCI
...
scanning. Log messages simplified to make the code shorter and less
convoluted. ScanPciDisplayPCICardInfo is now void since it was only
called from one place with a constant parameter.
2006-07-24 11:23:03 -07:00
Dave Airlie
8977b07434
glx: fix typo from tag removal
2006-07-23 03:50:52 +10:00
Adam Jackson
70869fc677
Yet more dead code.
2006-07-21 23:39:37 -04:00
Adam Jackson
7c1b2ee7a8
static markup, more dead code.
2006-07-21 23:35:13 -04:00
Adam Jackson
1c4f90b1d0
Open-coded path checks make baby Jesus cry.
2006-07-21 23:03:21 -04:00
Adam Jackson
114264584c
Remove a useless open() of the module we're about to load.
2006-07-21 22:55:41 -04:00
Adam Jackson
985611d5cd
Delete some long-unused testing code.
2006-07-21 22:37:59 -04:00
Ian Romanick
525257eb98
Fix stupid typos.
2006-07-21 19:16:38 -07:00
Daniel Stone
6cf844ab69
loader: walk directory paths with readdir(), don't stat() everything
...
Walk the directories with readdir, and don't stat everything we can
find. Thanks to davej for the public humiliation reminding me to go back
and re-fix this one.
2006-07-21 19:58:15 -04: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
Adam Jackson
63dfaa1d5b
Delete internal usage of the symbol ref/req lists.
2006-07-21 18:47:18 -04:00
Adam Jackson
bca9364f3f
Remove the loader's required and referenced symbol lists, dead code.
2006-07-21 18:41:46 -04:00
Daniel Stone
0486d3966d
fix kbproto dependency
...
Depend on kbproto >= 1.0.3, for unconditional definition of
XkbSA_XFree86Private.
2006-07-21 19:35:04 -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
aff404f293
Detach xf4bpp from cfb.
2006-07-21 18:24:37 -04:00
Adam Jackson
0aaac95b0d
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
Aaron Plattner
eeaad0e956
Fix the RandR failure path for rotated screens.
2006-07-21 15:20:40 -07:00
Ian Romanick
22db3fdb54
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
2006-07-21 13:55:37 -07:00
Daniel Stone
93cd53860c
kdrive: allow debugging
2006-07-21 15:19:21 -04:00
Daniel Stone
cd0874dda1
never define MEMBUG
...
Definining MEMBUG causes allocations to randomly fail.
2006-07-21 15:18:57 -04:00
Daniel Stone
093943d4d0
define DEBUG in DIX
...
Which makes #ifdef DEBUG actually useful. Incredible.
2006-07-21 15:18:48 -04:00
Daniel Stone
68b0678254
exa: only disable cw when COMPOSITE is built
2006-07-21 15:18:20 -04:00