summaryrefslogtreecommitdiff
path: root/hw/xfree86/common/xf86AutoConfig.c
AgeCommit message (Collapse)AuthorFilesLines
2009-12-22xfree86: Use xorg.conf.d directory for multiple config filesDan Nicholson1-1/+2
Currently there is a single file, xorg.conf, for configuring the server. This works fine most of the time, but it becomes a problem when packages or system services need to adjust the configuration. Instead, allow multiple configuration files to live in a directory. Typically this will be /etc/X11/xorg.conf.d. Files with a suffix of .conf will be read and added to the server configuration after xorg.conf. The server won't fall back to using the auto configuration unless there is no config file and there are no files in the config directory. Right now this uses a simpler search template than the config file search path by not using the command line or environment variable parameters. The matching code was refactored a bit to make this more coherent. Any DDX wanting to read the config files will need to call xf86initConfigFiles before opening/reading them. This is to allow xf86openConfigFile without xf86openConfigDirFiles and vice-versa. Signed-off-by: Dan Nicholson <dbn.lists@gmail.com> Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
2009-09-18xserver: added more Geode oddities to xf86AutoConfig.cMartin-Éric Racine1-2/+2
2009-09-09Use lowercase PCI vendor ID for NSC.Martin-Éric Racine1-1/+1
2009-09-08Added comment with the PCI device ID of Geode SCx200 series.Martin-Éric Racine1-1/+1
2009-09-04Formatted recent Geode PCI ID changes to fit a 80-column coding style.Martin-Éric Racine1-2/+3
2009-09-04Further explained what the Geode PCI ID is all about as comments.Martin-Éric Racine1-2/+2
2009-09-04Removed unnecessary curly braces for Geode LX PCI ID.Martin-Éric Racine1-2/+1
2009-09-04Updated the PCI Vendor and Device IDs for all Geode variants.Martin-Éric Racine1-5/+17
In practice, some of the native drivers for older Geode products have become deprecated due to lack of e.g. libpciaccess upgrade, but that's OK, since most distributions don't ship them anymore. In that case, we'll let X server fall back to good old VESA.
2009-08-18Sun bug 6872917: Xorg not querying /dev/fb when no xorg.conf existsAlan Coopersmith1-1/+18
commit 48ee5558333bd324463b6994735cabb23de262ec (OpenSolaris VT support) broke the autoconfiguration code in xf86AutoConfig.c that uses the Solaris-specific VIS_GETIDENTIFIER ioctl on a frame buffer device like /dev/fb by changing xf86Info.consoleFd from /dev/fb to a /dev/vt/* device. This fixes it by reworking the code to split the console device (/dev/vt/*, the vtXX CLI option) from the frame buffer device (/dev/fb, -dev option) to allow both VT and autoconfig to work. It also fixes the console device to use /dev/fb when VT's are not supported instead of throwing a Fatal Error because it can't open /dev/vt/0. Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
2009-07-24xfree86: "Staticize" functions in xf86AutoConfig.cTiago Vignatti1-42/+42
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
2009-07-09config: drop i810.Adam Jackson1-1/+0
The driver assuredly no longer builds against 1.7. Please don't feel compelled to fix it.
2009-03-27config: Fall back to vesa for Intel Poulsbo.Adam Jackson1-0/+2
2008-12-16config: Add vboxvideo and tga to the magic driver listAdam Jackson1-6/+7
Also sort the list while I'm here.
2008-10-26Bug#16501: autodetection of sbus graphic cardsBernhard R. Link1-0/+10
Add automatic detection of the graphic driver to load for sbus devices. This allows xorg to work on those devices without a "Device" section. Debian bug#483942. Signed-off-by: Julien Cristau <jcristau@debian.org>
2008-10-06xalloc+memset(0) -> xcallocAdam Jackson1-2/+1
2008-08-01Handle XGI cards in autoconfig.Adam Jackson1-0/+6
It's all a bit wonky since both sis(4) and xgi(4) claim to support the Volari Z7 and V5/8 (0x0020 and 0x0040), so let's side with xgi(4), why not. Note that the V3 (not V3XT) identifies itself as a trident chip.
2008-07-21Revert "Try nvidia before nv under the assumption that people who install it ↵Daniel Stone1-5/+1
usually want to *use* it, too." Per mailing list discussion. This reverts commit 66fb253082ea42179180303393e48846208987fa.
2008-07-20Try nvidia before nv under the assumption that people who install it usually ↵Aaron Plattner1-1/+5
want to *use* it, too.
2008-07-07Improved driver selection when autoconfiguring driver without xorg.confAlan Coopersmith1-81/+142
- Allow returning multiple drivers to try for a given PCI id (for instance, try "geode" then "amd" for AMD Geode hardware) - On Solaris, use VIS_GETIDENTIFIER ioctl as well as PCI id to choose drivers - Use wsfb instead of fbdev as a fallback on non-Linux SPARC platforms
2008-06-24Check for __amd64__, not __x86_64__.Adam Jackson1-1/+1
Spiritual revert of 1fa4de80fcfc697b5e5879cc351fb3e9dbf6acbe. Intel's C compiler claims to be gcc-compatible; if they're not defining the same macros as gcc then that's their bug, not ours. Even if we were to do this aliasing we should do it once and for all in servermd.h.
2008-04-23autoconfig: don't call closedir() when opendir() failedJulien Cristau1-70/+71
If opendir() fails, return from matchDriverFromFiles() immediately. Ubuntu bug 217647.
2008-04-21xf86: Change AutoConfig driver for PCI ID 022:2091 to 'geode'Jordan Crouse1-1/+5
2008-04-12Check for __x86_64__ when we check for __amd64__Matt Turner1-1/+1
It seems Intel C Compiler neglects to define __amd64__, __amd64, or amd64, but *does* define __x86_64__.
2008-04-01xfree86: don't crash in AutoConfig if the primary device is not pciGoneri Le Bouder1-2/+3
Only call matchDriverFromFiles() if we found a pci device. Debian bug#472823 (http://bugs.debian.org/472823).
2008-03-10Add the "amd" driver to magic driver selection.Adam Jackson1-2/+3
2008-03-04Remove all mention of the vga driver from the config logic.Adam Jackson1-3/+0
2008-02-22s/via/openchrome/ in the autoconfig logic.Adam Jackson1-1/+1
Xorg's via driver is effectively dead anyway.
2007-11-15Eliminate some redundancy in autoconfiguration.Adam Jackson1-22/+0
We already synthesize Monitor and Module sections for you, no need to specify them explicitly in the fake config buffer.
2007-10-22Define PCI_TXT_IDS_DIR more cleanlyDavid Nusinow1-3/+3
2007-10-21Add a note as to why the text file based PCI ID scheme is present at allDavid Nusinow1-0/+4
2007-10-21Fix compilation issue on FreeBSD (bug #12841)David Nusinow1-0/+4
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-21Make PCI text file directory configurableDavid Nusinow1-5/+6
2007-10-19Disable debian pci-id-list autoconfig code on non-linux.Eric Anholt1-12/+17
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-11Fix another compiler warningDavid Nusinow1-2/+1
2007-10-11Fix a warning about the control logic in xchomp()David Nusinow1-1/+1
2007-10-11Remove some unused variablesDavid Nusinow1-3/+0
2007-10-11Separate choosing driver from the file-based implementationDavid Nusinow1-29/+37
This clears the implementation out of the way to prepare for development of a symbol-based resolution scheme
2007-10-11When there's no xorg.conf, use the video driver autoloading functionDavid Nusinow1-16/+1
2007-10-09Use the best guess heuristic as a fallback for autoloadingDavid Nusinow1-0/+3
This prevents breaking the current behavior
2007-10-09Fix autoloading of drivers for pci-reworkDavid Nusinow1-17/+13
2007-10-09First pass at improved video driver autoloadingDavid Nusinow1-0/+205
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-09Load intel instead of i810 when autoconfiguringDavid Nusinow1-1/+1
2007-08-23Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into ↵Ian Romanick1-1/+0
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-23Get rid of the type1 font module.Julien Cristau1-1/+0
It is completely replaced by freetype these days.
2007-06-18Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into ↵Ian Romanick1-1/+1
pci-rework Conflicts: hw/xfree86/os-support/bus/Pci.c hw/xfree86/os-support/bus/linuxPci.c
2006-12-08Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver ↵Ian Romanick1-0/+3
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-09-14Load the default module set when no Module section is given in the config.Adam Jackson1-0/+3
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-08-10Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into ↵Ian Romanick1-1/+0
pci-rework
2006-08-09Remove TargetRefresh option from the autoconfig logic.Adam Jackson1-1/+0
The default target of 75Hz is almost always wrong for LCDs.
2006-08-02Eliminate the last few places outside xf86pciBus.c that useIan Romanick1-11/+11
xf86PciVideoInfo. In all cases this means converting the code to use the pci_device_iterator interfaces.