andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
3,576 Commits 86 Branches 473 Tags 48 MiB
ab7a6d860d
Commit Graph

16 Commits

Author SHA1 Message Date
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