a16360733e
Fix root bus/domain selection on alpha
2007-02-25 21:00:25 +00:00
e540d572c5
Merge fix missed on previous commit.
2007-02-14 15:38:10 -08:00
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
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
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
637b19b3ee
Eliminate pciControlBridge, pciGetBridgeBuses, and pciGetBridgeResources.
2007-01-22 09:58:33 -08:00
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
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
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
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
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
20e9144c07
Add $(DIX_CFLAGS) to remaining Makefile.am files
2006-11-07 12:49:28 -08: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
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
27d682fa03
Fix from HEAD accidentally reverted during merge.
2006-10-24 09:04:14 -07:00
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
1b94c117e0
Fixing probably long-standing bug in domain support.
2006-10-10 19:37:22 +02:00
d812f486a0
Really fix sparc on 64-bit kernel/32-bit userland.
...
Commit b3a3020fd0
2006-09-20 15:39:39 -07:00
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
5508f7646f
Remove prototypes from some functions that were previously removed.
2006-08-08 16:43:31 -07:00
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
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
23f44df900
Remove pciConfigPtr and all of the associated cruft.
2006-08-02 09:55:32 -07:00
a94176627c
Eliminate all uses of the businfo field of pciDevice / pciConfigPtr.
2006-07-31 14:33:58 -07:00
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
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
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
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
e487627992
Modify xf86BusAccWindowsFromOS and xf86AccResFromOS to use the
...
libpciaccess interfaces.
2006-07-24 12:23:23 -07:00
4b474cbc1a
The functions xf86PciBusAccWindowsFromOS and xf86BusAccWindowsFromOS
...
are identical. Just have one call the other.
2006-07-24 12:17:27 -07:00
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
0aaac95b0d
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
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
18624a9b7c
Modify linuxGetSizesStruct to use pci_device instead of pciConfigPtr.
2006-07-13 21:10:48 -07:00
37838de62e
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
...
Conflicts:
hw/xfree86/os-support/bus/linuxPci.c
2006-07-06 13:01:57 -07:00
8d07ee070e
Refactor linuxGetIOSize and linuxGetSizes. Eliminate the unnecessary
...
optimization in the search loop.
2006-07-06 12:48:51 -07:00
4e3c9ab8c9
Remove some static declarations for things that were removed in
...
previous commits.
2006-06-09 16:56:54 -07:00
46f55f5dea
Initial batch of changes for PCI rework. All future changes will be
...
tracked individually.
2006-06-07 14:09:02 -07:00
8444bb77c9
When we can, bound the maximum number of PCI devices to attempt to scan, by
...
the number found on the system. Only implemented for Linux right now.
2006-06-05 20:22:06 +00:00
8e8c6faecd
Add support for kFreeBSD systems. (Robert Millan, Aurelien Jarno)
2006-06-03 10:48:37 +00:00
56f21bda1c
Bug #6583 : Only open /proc/bus/pci/devices once. (Bill Nottingham)
2006-06-01 22:30:52 +00:00
deebf6bd51
Bug #4139 : Fix a BAR remapping bug that could lead to IERR and system hang.
...
(Egbert Eich)
2006-05-18 23:52:51 +00:00
26fa45b642
Bug #6751 : Use the Linux PCI ROM interface on Linux properly. The old
...
domain code, still modified BARs not a good idea, Just talk to sysfs,
if 0 read, fallback to old methods.
2006-04-26 11:40:58 +00:00
a68c11bb1d
Mark everything in xf86sym.c as _X_EXPORT.
2006-03-25 19:52:05 +00:00
d0d336efd5
Add support for ZX2 PCI-E local bus adaptors. (Alex Williamson, HP)
...
Use soft timeout register to avoid MCAs when probing for non-existent local
bus adaptors on ZX2. (Alex Williamson, HP)
2006-03-16 16:29:17 +00:00
cfdacab33a
Eliminate unused PCI BIOS reading functionality. The old code used several
...
function pointers to implement a level of flexability that was never
used. The code also had unused support for extracting a single image
type from a larger expansion ROM.
Fix the spelling of PCI_BIOS_OPEN_FIRMWARE.
Fix a couple errors in #ifdef debug code.
These changes have been tested on x86 and x86-64 Linux.
2006-02-21 00:02:08 +00:00
5fd0f94006
Eliminate all the code for querying the PCI class from the PCI ID database.
...
Class information is not, and never has been, stored there. Therefore,
this is just a bunch of elaborate code to read 0x00000000.
This has received testing on x86 and x86-64 Linux.
2006-02-20 23:45:50 +00:00
2949c705f1
Add all subdirs used to DIST_SUBDIRS, and files to EXTRA_DIST.
...
Attempt to build xeglmodule.c, not xglxmodule.c.
Add xf86Sbus.h to EXTRA_DIST, as _HEADERS doesn't appear to get the same
treatment as _SOURCES in terms of automatically DISTing.
2006-01-10 03:23:05 +00:00
fc69a2e729
Remove PowerMAX_OS define it never worked , it'll never work again,
...
finishes running joke of OLS2005
2005-12-29 08:42:49 +00:00
7c00afd0ec
Define XFree86Server only where it is required.
2005-12-02 06:02:45 +00:00
ccfaf82367
Bug #5160 : Fix the modular build to try to use the same logic for choosing
...
the architecture/os-specific bus support as monolithic.
2005-12-01 05:04:07 +00:00
da5d66f2ff
Fix usage of XFree86LOADER/XFree86Module/IN_MODULE and update loadable
...
module builds to reflect this change.
2005-11-29 16:39:33 +00:00
f8430a1b86
Bug #2880 , add functions for byte and word level access to pci config
...
space.
Fix broken utf8 again.
2005-11-08 19:04:56 +00:00
af211a9bc1
Fix PCI bus scan on ia64 E8870 chipsets.
2005-10-19 22:30:09 +00:00
1859c62607
include/dix-config.h.in Add support for more extensions
...
Add missing files to EXTRA_DIST
2005-10-17 07:18:59 +00:00
b623c60745
Linux/Alpha support (Stefaan De Roeck)
2005-09-19 22:44:49 +00:00
53e489c0e3
Work around ATI expansion ROM problem on IA64 caused by prototype HP
...
McKinley systems. (Bdale Garbee)
2005-08-26 05:47:36 +00:00
825a95a1fa
Remove use of dix-config and xorg-config.h from public headers.
2005-08-24 11:18:35 +00:00
367f450739
Change xorg_bus_sbus to xorg_bus_sparc; build sparcPci.c on all SPARCs.
2005-08-21 08:43:46 +00:00
71b3fea94e
Typo fix (SOURCE -> SOURCES).
2005-08-21 08:24:52 +00:00
db2909ce76
Add test for SPARC. Build SparcMulDiv.S on all SPARCs.
...
Make the default font path configurable.
2005-08-21 06:56:19 +00:00
d96e666686
Add sparcPci.c to EXTRA_DIST.
2005-08-20 18:52:07 +00:00
22694500e0
Add xf86Sbus.h to EXTRA_DIST files (bugzilla #4128 )
2005-08-17 23:20:27 +00:00
fedbce2186
EXTRA_DIST hacks to get all the OS support files into the tarball.
2005-08-05 00:13:31 +00:00
d7c246f35b
Only build ix86Pci.c on x86 & amd64 platforms Set DEFAULT_INT10 to x86emu
...
on everything but Linux/x86 Fix Sbus.c inclusion on sparc platforms
2005-08-02 23:57:52 +00:00
2d7b1893be
- Workaround for AS_HELP_STRING compatibility with older autoconf.
...
- New intermediate build target for Xorg server
- ia64 fixes
2005-08-02 00:41:07 +00:00
4f38526566
- Use fbdevhwstub.c if <linux/fb.h> is not found
...
- Use x86emu on Solaris instead of vm86
- Better per-OS control over which xf86Kbd*.c and *Pci.c files to build
- Set various #defines to be defined or not on Solaris as needed
2005-07-13 22:54:02 +00:00
0bb669638f
Change <X11/misc.h> and <X11/os.h> to "misc.h" and "os.h".
2005-07-03 08:53:54 +00:00
e03198972c
Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings.
...
Add XSERV_t, TRANS_SERVER, TRANS_REOPEN to quash warnings.
Add #include <dix-config.h> or <xorg-config.h>, as appropriate, to all
source files in the xserver/xorg tree, predicated on defines of
HAVE_{DIX,XORG}_CONFIG_H. Change all Xfont includes to
<X11/fonts/foo.h>.
2005-07-03 07:02:09 +00:00
826a6f029f
Continuing Makefile cleanup; add DIX_CFLAGS and XORG_CFLAGS everywhere.
2005-07-02 18:59:44 +00:00
9b1debcdb6
Change all misc.h and os.h references to <X11/foo.h>.
2005-07-01 22:43:43 +00:00
ded56b1a74
Adding initial build system.
2005-07-01 20:29:53 +00:00
a8a61bbe22
Initial experimental support for AMD64 builds on Solaris 10 x86. Improved
...
support for 64-bit SPARC builds on Solaris as well.
2005-05-21 07:46:38 +00:00
d5739efd2c
Port X.Org to FreeBSD/powerpc. This makes a bit of math for sysmouse in
...
mouse.c explicitly signed, avoiding the need for -fsigned-chars. (Peter
Grehan, grehan at FreeBSD dot org)
2005-05-04 04:14:58 +00:00
d450a70e00
Bug #2373 : SGI Altix platform support. (Shrijeet Mukherjee, Jesse Barnes,
...
Bjorn Helgaas, Egbert Eich.)
2005-04-22 17:45:14 +00:00
16c2499b8f
Bug #2373 : SGI Altix platform support. (Shrijeet Mukherjee, Jesse Barnes,
...
Bjorn Helgaas, Egbert Eich.)
2005-04-22 16:49:22 +00:00
292c4cff26
Fix includes right throughout the Xserver tree:
...
change "foo.h" to <X11/foo.h> for core headers, e.g. X.h, Xpoll.h;
change "foo.h", "extensions/foo.h" and "X11/foo.h" to
<X11/extensions/foo.h> for extension headers, e.g. Xv.h;
change "foo.[ch]" to <X11/Xtrans/foo.[ch]> for Xtrans files.
2005-04-20 12:25:48 +00:00
6848b03538
Correct the mask bits when checking for a 64bit memory base in PCI config
...
space (bugzilla #2963 ).
2005-04-11 10:05:38 +00:00
7eb6b69ebd
Support for HP's IPF ZX1 systems (Alex Williamson).
2005-04-04 09:55:25 +00:00
e7369daba5
Added PCI2Host bus translations for linux PPC and fixed fixed bugs in
...
macros that apply these functions (Bill Randle Bugzilla #325 and #327 ).
2005-02-09 11:12:54 +00:00
44e2d91679
xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Sbus.h
...
xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c
//bugs.freedesktop.org/show_bug.cgi?id=825) attachment #956
(https://bugs.freedesktop.org/attachment.cgi?id=956 ): Fix build
problems on Linux/SPARC. Patch by Jeremy Huddleston
<eradicator@gentoo.org>. Approved in the 2005-01-31 Xorg
release-wranglers phone call.
2005-02-02 00:55:21 +00:00
d23c46dd3e
Modifying X.Org Xserver DDX to allow to run X with ordinary user
...
permissions when no access to HW registers is required. For API changes
which mostly involve the modifications to make the RRFunc (introduced
with 6.8) more flexible please check Bugzilla #2407 . NOTE: This patch
applies changes to OS specific files for other OSes which I cannot
test.
2005-01-28 16:13:00 +00:00
13b5a93b70
Fix interpretation of 64bit PCI bases: read hi long word from the right bar
...
(Michael Yaroslavtsev, Bugzilla #2322 ).
2005-01-25 10:08:18 +00:00
3035739e5b
Bug #2123 < https://bugs.freedesktop.org/show_bug.cgi?id=2123 > Attachment
...
#1587 <https://bugs.freedesktop.org/attachment.cgi?id=1587 > Call to
uname should not check for return == 0, but for >= 0 instead
2004-12-22 08:28:16 +00:00
d0b17bda4d
Removed #ifdef'ed out code together with the comment explaining why it was
...
#ifdef'ed out.
Fixed typo.
Added comment to a changed that's been committed with one of the previous
commits.
2004-12-14 08:59:20 +00:00
9286a5d032
Add fix for 460gx pci scan code.
2004-12-12 22:58:37 +00:00
Jay Estabrook
Ian Romanick
Jonathan Lim
Eric Anholt
Bjorn Helgaas
Keith Packard
Egbert Eich
Matthias Hopf
Donnie Berkholz
Jesse Barnes
Ian Romanick
Adam Jackson
Daniel Stone
Ian Romanick
Adam Jackson
Dave Airlie
Kevin E Martin
Eric Anholt
Kristian Høgsberg
Alan Coopersmith
Egbert Eich
Roland Mainz