Age | Commit message (Collapse) | Author | Files | Lines |
|
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
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.
|
|
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>
|
|
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
|
|
The driver assuredly no longer builds against 1.7. Please don't feel
compelled to fix it.
|
|
|
|
Also sort the list while I'm here.
|
|
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>
|
|
|
|
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.
|
|
usually want to *use* it, too."
Per mailing list discussion.
This reverts commit 66fb253082ea42179180303393e48846208987fa.
|
|
want to *use* it, too.
|
|
- 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
|
|
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.
|
|
If opendir() fails, return from matchDriverFromFiles() immediately.
Ubuntu bug 217647.
|
|
|
|
It seems Intel C Compiler neglects to define __amd64__, __amd64, or
amd64, but *does* define __x86_64__.
|
|
Only call matchDriverFromFiles() if we found a pci device.
Debian bug#472823 (http://bugs.debian.org/472823).
|
|
|
|
|
|
Xorg's via driver is effectively dead anyway.
|
|
We already synthesize Monitor and Module sections for you, no need to
specify them explicitly in the fake config buffer.
|
|
|
|
|
|
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.
|
|
|
|
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.
|
|
|
|
|
|
|
|
This clears the implementation out of the way to prepare for development
of a symbol-based resolution scheme
|
|
|
|
This prevents breaking the current behavior
|
|
|
|
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.
|
|
|
|
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
|
|
It is completely replaced by freetype these days.
|
|
pci-rework
Conflicts:
hw/xfree86/os-support/bus/Pci.c
hw/xfree86/os-support/bus/linuxPci.c
|
|
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
|
|
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.
|
|
pci-rework
|
|
The default target of 75Hz is almost always wrong for LCDs.
|
|
xf86PciVideoInfo. In all cases this means converting the code to use
the pci_device_iterator interfaces.
|