Commit Graph

132 Commits

Author SHA1 Message Date
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
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
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
Ian Romanick
18624a9b7c Modify linuxGetSizesStruct to use pci_device instead of pciConfigPtr. 2006-07-13 21:10:48 -07:00
Ian Romanick
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
Ian Romanick
8d07ee070e Refactor linuxGetIOSize and linuxGetSizes. Eliminate the unnecessary
optimization in the search loop.
2006-07-06 12:48:51 -07:00
Ian Romanick
4e3c9ab8c9 Remove some static declarations for things that were removed in
previous commits.
2006-06-09 16:56:54 -07:00
Ian Romanick
46f55f5dea Initial batch of changes for PCI rework. All future changes will be
tracked individually.
2006-06-07 14:09:02 -07:00
Daniel Stone
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
Daniel Stone
8e8c6faecd Add support for kFreeBSD systems. (Robert Millan, Aurelien Jarno) 2006-06-03 10:48:37 +00:00
Daniel Stone
56f21bda1c Bug #6583: Only open /proc/bus/pci/devices once. (Bill Nottingham) 2006-06-01 22:30:52 +00:00
Adam Jackson
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
Dave Airlie
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
Adam Jackson
a68c11bb1d Mark everything in xf86sym.c as _X_EXPORT. 2006-03-25 19:52:05 +00:00
Daniel Stone
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
Ian Romanick
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
Ian Romanick
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
Daniel Stone
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
Dave Airlie
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
Kevin E Martin
7c00afd0ec Define XFree86Server only where it is required. 2005-12-02 06:02:45 +00:00
Eric Anholt
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
Kevin E Martin
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
Kristian Høgsberg
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
Adam Jackson
af211a9bc1 Fix PCI bus scan on ia64 E8870 chipsets. 2005-10-19 22:30:09 +00:00
Kevin E Martin
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
Alan Coopersmith
b623c60745 Linux/Alpha support (Stefaan De Roeck) 2005-09-19 22:44:49 +00:00
Daniel Stone
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
Daniel Stone
825a95a1fa Remove use of dix-config and xorg-config.h from public headers. 2005-08-24 11:18:35 +00:00
Daniel Stone
367f450739 Change xorg_bus_sbus to xorg_bus_sparc; build sparcPci.c on all SPARCs. 2005-08-21 08:43:46 +00:00
Daniel Stone
71b3fea94e Typo fix (SOURCE -> SOURCES). 2005-08-21 08:24:52 +00:00
Daniel Stone
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
Adam Jackson
d96e666686 Add sparcPci.c to EXTRA_DIST. 2005-08-20 18:52:07 +00:00
Alan Coopersmith
22694500e0 Add xf86Sbus.h to EXTRA_DIST files (bugzilla #4128) 2005-08-17 23:20:27 +00:00
Adam Jackson
fedbce2186 EXTRA_DIST hacks to get all the OS support files into the tarball. 2005-08-05 00:13:31 +00:00
Alan Coopersmith
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
Adam Jackson
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
Alan Coopersmith
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
Daniel Stone
0bb669638f Change <X11/misc.h> and <X11/os.h> to "misc.h" and "os.h". 2005-07-03 08:53:54 +00:00
Daniel Stone
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
Daniel Stone
826a6f029f Continuing Makefile cleanup; add DIX_CFLAGS and XORG_CFLAGS everywhere. 2005-07-02 18:59:44 +00:00
Daniel Stone
9b1debcdb6 Change all misc.h and os.h references to <X11/foo.h>. 2005-07-01 22:43:43 +00:00
Daniel Stone
ded56b1a74 Adding initial build system. 2005-07-01 20:29:53 +00:00
Alan Coopersmith
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
Eric Anholt
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
Adam Jackson
d450a70e00 Bug #2373: SGI Altix platform support. (Shrijeet Mukherjee, Jesse Barnes,
Bjorn Helgaas, Egbert Eich.)
2005-04-22 17:45:14 +00:00
Adam Jackson
16c2499b8f Bug #2373: SGI Altix platform support. (Shrijeet Mukherjee, Jesse Barnes,
Bjorn Helgaas, Egbert Eich.)
2005-04-22 16:49:22 +00:00
Daniel Stone
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
Egbert Eich
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
Egbert Eich
7eb6b69ebd Support for HP's IPF ZX1 systems (Alex Williamson). 2005-04-04 09:55:25 +00:00
Egbert Eich
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
Roland Mainz
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
Egbert Eich
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
Egbert Eich
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
Alan Coopersmith
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
Egbert Eich
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
Kristian Høgsberg
9286a5d032 Add fix for 460gx pci scan code. 2004-12-12 22:58:37 +00:00
Egbert Eich
af717ae57d Make Xorg the default server to install.
Avoid PIO access on IA64. Some IA64 machine check if legacy ports outside
    the VGA range are accessed. The ATi driver however does this to probe
    for ISA Mach8/32/64. Since no IA64 has ISA slots this restriction
    should not be relevant to the user.
Avoid recursive calls of xf86scanpci(). This function normally detects that
    it has been called before by checking if the PCI structure is filled
    out. So far if this was not the case (because PCI probing has failed
    for some reason) the function is traversed again. With the chipset
    specific PCI bus probing this can lead to an endless recursive loop as
    the post-probing code calls xf86scanpci() from within this function.
The OS specific PCI code for Linux worked only if bus 0 was populated as it
    checked for the presence of /proc/bus/pci/00. Fixed to check for
    /proc/bus/pci/<bus_to_look_for> instead.
2004-11-30 08:38:44 +00:00
Egbert Eich
1074992c28 Fixed sig11 which occured when calling a CloseDisplay() after
XScreenSaverSetAttributes() followed by XScreenSaverUnsetAttributes().
    Caused by missing FreeResource() in XScreenSaverUnsetAttributes().
Removing unused DDC sections that caused misinterpretation of DDC data due
    to a missing break statement in a switch.
Fixed typo: #if <-> #ifdef.
2004-11-01 16:05:27 +00:00
Egbert Eich
516f452e78 Adding support for OS dependent probing of IA64 chipsets. Not all IA64
chipsets can be probed without OS support as probing them is only
    possible using ACPI. One example of this are the HP ZX1/2 chipsets:
    previously the code assumed that these chips were present when no other
    of the known chipsets could be probed. This assumption brought SGI
    Altrix machines with 64 CPUs to a grinding halt.
2004-09-15 09:23:59 +00:00
Kevin E Martin
f77f1d5072 Apply PPC64 build patch (Bug #303, Mike A. Harris, Alan Coopersmith). 2004-08-11 21:14:18 +00:00
Egbert Eich
c2275b31ad Removed bugs on TweakMemorySize() which prevented it from working at all.
Initialized last element of BIOS version number string to 0 to avoid random
    problems.
2004-07-30 19:04:14 +00:00
Egbert Eich
df2b55a25b Separated Intel drivers from default DriDrivers to avoid building them on
IA64 (Egbert Eich).
Fixed wrong function prototype (Egbert Eich).
Don't test for generic VGA on IA64 (Egbert Eich).
Fixed a segfault when accessing a structure before verifying the pointer
    exists (Egbert Eich).
Added a showcache option for debugging (Egbert Eich).
Increase default video RAM size to 16MB when DRI is enabled and more than
    128MB are available (Egbert Eich). Fixed lockups during mode switch.
    Problem was introduced when attempting to copy the behavior during
    LeaveVT()/EnterVT() but but forgetting to call I810DRILeave() before
    I810DRIEnter(). The entire DRILeave()/Enter() scenario has been
    commented out as it didn't seem to be necessary (Egbert Eich).
Fix TweakMemorySize() (tested with i855/i865) (Egbert Eich).
increased MAX_DEVICES to 128 (Egbert Eich).
Use OS provided PCI config space access as default method (Egbert Eich).
Added support for Linux 2.6 proc file format.
Fixed unaligned accesses to pieces of the VBE info block. VESA did not
    align elements to size (Egbert Eich).
2004-07-06 14:37:48 +00:00
Eric Anholt
22bad9474b DRI XFree86-4_3_99_12-merge import 2004-06-16 09:22:17 +00:00
Egbert Eich
2fb5886200 Merging XORG-CURRENT into trunk 2004-04-23 19:54:30 +00:00
Egbert Eich
dae90c3af9 Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 2004-03-14 08:34:49 +00:00
Egbert Eich
867451f1ab Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 2004-03-03 12:12:50 +00:00
Egbert Eich
df0313d35b readding XFree86's cvs IDs 2004-02-26 13:36:15 +00:00
Egbert Eich
147aae87fd Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 2004-02-26 09:23:53 +00:00
Kaleb Keithley
4ee0a53de8 Import most of XFree86 4.4RC3. This import excludes files which have the
new license. If we want to, later we can import 4.4RC3 again and pick
    up the files that have the new license, but for now the vendor branch
    is "pure."
2004-02-23 20:35:22 +00:00
Egbert Eich
3c64b65d80 Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004 2004-01-29 08:08:57 +00:00
Kaleb Keithley
12e532010b XFree86 4.3.99.902 (RC 2) 2003-12-19 20:55:39 +00:00
Kaleb Keithley
adc7f9a4eb XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks 2003-11-25 19:29:01 +00:00
Kaleb Keithley
9508a382f8 Initial revision 2003-11-14 16:48:57 +00:00