Adam Jackson
0706e5e790
Eliminate some redundancy in autoconfiguration.
...
We already synthesize Monitor and Module sections for you, no need to
specify them explicitly in the fake config buffer.
2007-11-15 14:15:09 -05:00
David Nusinow
d808d653d1
Define PCI_TXT_IDS_DIR more cleanly
2007-10-22 21:30:04 -04:00
David Nusinow
be9b0e558d
Add a note as to why the text file based PCI ID scheme is present at all
2007-10-21 23:49:14 -04:00
David Nusinow
b79b965bd9
Fix compilation issue on FreeBSD (bug #12841 )
...
Hide getline call by checking for glibc. If not, use fgetln instead. Even
though this section is now #ifdef'ed for linux only, this should help make
it more portable if non-linux folks end up wanting it.
2007-10-21 23:46:54 -04:00
David Nusinow
7f5e71fa73
Make PCI text file directory configurable
2007-10-21 23:41:49 -04:00
Eric Anholt
7e1cada6c6
Disable debian pci-id-list autoconfig code on non-linux.
...
It contains static paths, fails to build on non-glibc, and apparently just
exists to support distributions managing binary drivers and open-source drivers
together. Also restores previous code for fallback to vesa if nothing is
detected.
2007-10-19 15:16:19 -07:00
David Nusinow
eaf0e2a21c
Fix another compiler warning
2007-10-11 22:31:24 -04:00
David Nusinow
a5089af726
Fix a warning about the control logic in xchomp()
2007-10-11 22:24:31 -04:00
David Nusinow
cdf29ff45a
Remove some unused variables
2007-10-11 22:23:34 -04:00
David Nusinow
3367091f7f
Separate choosing driver from the file-based implementation
...
This clears the implementation out of the way to prepare for development
of a symbol-based resolution scheme
2007-10-11 22:21:38 -04:00
David Nusinow
ea2d4dc468
When there's no xorg.conf, use the video driver autoloading function
2007-10-11 20:26:02 -04:00
David Nusinow
37898b824f
Use the best guess heuristic as a fallback for autoloading
...
This prevents breaking the current behavior
2007-10-09 22:13:15 -04:00
David Nusinow
847fbbf4d2
Fix autoloading of drivers for pci-rework
2007-10-09 22:13:15 -04:00
David Nusinow
6033d8150b
First pass at improved video driver autoloading
...
This is what we're currently shipping in Debian. Enables the ability for
drivers to ship a text file listing PCI ID's they support, and have the
server read them on startup when no driver is specified. This works, but
isn't the final solution.
2007-10-09 22:13:15 -04:00
David Nusinow
81d7b81146
Load intel instead of i810 when autoconfiguring
2007-10-09 22:13:15 -04: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
Julien Cristau
13949f9972
Get rid of the type1 font module.
...
It is completely replaced by freetype these days.
2007-08-23 11:27:33 +02: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
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
Adam Jackson
739224d05e
Load the default module set when no Module section is given in the config.
...
Also, synchronize that list with the list for the pseudoconfig file used
when starting with no config file. These really need to be better unified.
2006-09-14 19:03:32 -04:00
Ian Romanick
1a5561c4ec
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
2006-08-10 10:20:37 -07:00
Adam Jackson
db82e12fac
Remove TargetRefresh option from the autoconfig logic.
...
The default target of 75Hz is almost always wrong for LCDs.
2006-08-09 14:55:17 -04:00
Ian Romanick
83ebf61ec0
Eliminate the last few places outside xf86pciBus.c that use
...
xf86PciVideoInfo. In all cases this means converting the code to use
the pci_device_iterator interfaces.
2006-08-02 13:33:33 -07:00
Ian Romanick
26c9587f90
Build fixes for last pull from HEAD.
2006-07-31 13:54:36 -07: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
Adam Jackson
990a400905
Remove getconfig horrorshow. Replace with a static built-in rule list for now.
2006-07-26 19:03:39 -04: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
Adam Jackson
0aaac95b0d
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04: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
Alan Coopersmith
cff4b1c216
Check for getconfig in GETCONFIG_DIR if it's not found in module dir.
2005-08-23 20:12:26 +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
Egbert Eich
2fb5886200
Merging XORG-CURRENT into trunk
2004-04-23 19:54:30 +00:00
Kaleb Keithley
90f1536dd3
Initial revision
2003-11-25 19:29:01 +00:00