Eric Anholt
							
						 
						
							
							
							
							
								
							
							
								b4b0d901d9 
								
							 
						 
						
							
							
								
								Merge branch 'randr-1.2'  
							
							 
							
							... 
							
							
							
							Conflicts:
	dix/events.c
	dix/getevents.c
	hw/xfree86/common/xf86Mode.c
	hw/xfree86/dri/Makefile.am
	hw/xfree86/os-support/drm/xf86drm.c
	hw/xfree86/os-support/xf86drm.h 
							
						 
						
							2006-11-27 15:43:15 -08:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Bram Verweij
							
						 
						
							
							
							
							
								
							
							
								0567a6337b 
								
							 
						 
						
							
							
								
								xfree86/linux acpi: fix tokenising  
							
							 
							
							... 
							
							
							
							Split on a space, rather on the 'video' string, as strtok takes a char,
not a string. 
							
						 
						
							2006-11-08 18:00:52 +02:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Daniel Stone
							
						 
						
							
							
							
							
								
							
							
								809e2841aa 
								
							 
						 
						
							
							
								
								xfree86: add general handler, port ACPI to it (bug  #5665 )  
							
							 
							
							... 
							
							
							
							Add 'general' handler registration, which will not trigger DPMS when an
event comes in.
Make ACPI use this. 
							
						 
						
							2006-11-08 15:30:03 +02:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Keith Packard
							
						 
						
							
							
							
							
								
							
							
								20e9144c07 
								
							 
						 
						
							
							
								
								Add $(DIX_CFLAGS) to remaining Makefile.am files  
							
							 
							
							
							
						 
						
							2006-11-07 12:49:28 -08:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Bernhard Rosenkraenzer
							
						 
						
							
							
							
							
								
							
							
								8deaaa312a 
								
							 
						 
						
							
							
								
								automake: avoid use of reserved _SOURCES keyword (bug  #8866 )  
							
							 
							
							... 
							
							
							
							Avoid using _SOURCES unless we're directly referencing a program or
library to be built; use _SRCS instead.  Shuts automake 1.10 up. 
							
						 
						
							2006-11-04 19:08:28 +02:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Matthias Hopf
							
						 
						
							
							
							
							
								
							
							
								072c022e73 
								
							 
						 
						
							
							
								
								Fix obviously wrong boundary checks + cleanup unused vars.  
							
							 
							
							... 
							
							
							
							Also disable compilation of code that is no longer used anywhere in the whole
Xserver tree. 
							
						 
						
							2006-11-03 18:59:51 +01:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Matthias Hopf
							
						 
						
							
							
							
							
								
							
							
								5afc6c1a14 
								
							 
						 
						
							
							
								
								Added linux 2.6 compatible domain aware device scanning code.  
							
							 
							
							... 
							
							
							
							Additional scanning code uses the /sys interface of 2.6 kernels.
Cleaned up the use of tags and already split domain/bus/dev/fn. 
							
						 
						
							2006-11-03 18:59:51 +01:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Daniel Stone
							
						 
						
							
							
							
							
								
							
							
								01afa533aa 
								
							 
						 
						
							
							
								
								xfree86/os-support: axe more unused files  
							
							 
							
							
							
						 
						
							2006-11-02 04:32:37 +02:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Daniel Stone
							
						 
						
							
							
							
							
								
							
							
								18c246a13b 
								
							 
						 
						
							
							
								
								Merge branch 'input-hotplug'  
							
							 
							
							
							
						 
						
							2006-11-02 03:21:37 +02:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Daniel Stone
							
						 
						
							
							
							
							
								
							
							
								81728558a0 
								
							 
						 
						
							
							
								
								input: add non-keyboard bell ringing function  
							
							 
							
							... 
							
							
							
							Add a generic 'ring the bell' function (console bell on Linux and BSD,
/dev/audio on Solaris), and add DDX functions for this.  Make this the
core keyboard's bell.
Port Xvfb and Xnest to this.
Port XFree86 to this, with OS-specific hooks for Linux, BSD, and Solaris
taken from foo_io.c in the old layer. 
							
						 
						
							2006-11-01 23:10:26 +02:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Myron Stowe
							
						 
						
							
							
							
							
								
							
							
								794f2e7291 
								
							 
						 
						
							
							
								
								xfree86: re-enable chipset-specific drivers for Linux/ia64  
							
							 
							
							... 
							
							
							
							Re-enable chipset-specific support for Linux/ia64, by linking in
lnx_ia64.c. 
							
						 
						
							2006-10-26 20:38:58 +03:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Daniel Stone
							
						 
						
							
							
							
							
								
							
							
								d6433be3cc 
								
							 
						 
						
							
							
								
								Merge branch 'master' into input-hotplug  
							
							 
							
							
							
						 
						
							2006-08-12 21:50:52 +03:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Bastian Blank
							
						 
						
							
							
							
							
								
							
							
								f7919c2879 
								
							 
						 
						
							
							
								
								xfree86: don't do legacy IO on ARM or S/390 (Debian  #362641 )  
							
							 
							
							... 
							
							
							
							Don't attempt to poke legacy IO ranges on ARM or S/390. 
							
						 
						
							2006-08-12 20:43:25 +03:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Daniel Stone
							
						 
						
							
							
							
							
								
							
							
								59dcc62906 
								
							 
						 
						
							
							
								
								xfree86: remove Xqueue support completely  
							
							 
							
							
							
						 
						
							2006-08-12 20:39:08 +03:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Daniel Stone
							
						 
						
							
							
							
							
								
							
							
								008aa7eb6e 
								
							 
						 
						
							
							
								
								completely remove OS keyboard layer  
							
							 
							
							... 
							
							
							
							Completely axe the keyboard layer from os-support. 
							
						 
						
							2006-08-12 18:56:05 +03:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Daniel Stone
							
						 
						
							
							
							
							
								
							
							
								e7ac27ad81 
								
							 
						 
						
							
							
								
								revert accidental deletion of lnx_io.c; re-delete lnx_kbd.c  
							
							 
							
							... 
							
							
							
							Thinko'd which file to remove after merging from master. 
							
						 
						
							2006-07-21 19:29:28 -04:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Daniel Stone
							
						 
						
							
							
							
							
								
							
							
								81913a1291 
								
							 
						 
						
							
							
								
								remove undead files from master  
							
							 
							
							... 
							
							
							
							Remove dead files which worked their way back in when merging from master.
Ugh. 
							
						 
						
							2006-07-21 19:10:26 -04:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Daniel Stone
							
						 
						
							
							
							
							
								
							
							
								7465010d59 
								
							 
						 
						
							
							
								
								Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug  
							
							 
							
							
							
						 
						
							2006-07-21 19:05:41 -04:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Adam Jackson
							
						 
						
							
							
							
							
								
							
							
								0aaac95b0d 
								
							 
						 
						
							
							
								
								Remove RCS tags.  Fix Xprint makefile braindamage.  
							
							 
							
							
							
						 
						
							2006-07-21 17:56:00 -04:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Kristian Høgsberg
							
						 
						
							
							
							
							
								
							
							
								3eeb62e8f5 
								
							 
						 
						
							
							
								
								bug  #890 : completely remove deprecated keyboard driver  
							
							 
							
							... 
							
							
							
							Remove all remnants of the old built-in keyboard driver. 
							
						 
						
							2006-07-21 16:33:28 -04:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Ian Romanick
							
						 
						
							
							
							
							
								
							
							
								2f98841fde 
								
							 
						 
						
							
							
								
								Remove unused variable.  
							
							 
							
							
							
						 
						
							2006-07-20 16:08:27 -07:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Ian Romanick
							
						 
						
							
							
							
							
								
							
							
								c69c00d652 
								
							 
						 
						
							
							
								
								Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver  
							
							 
							
							
							
						 
						
							2006-07-20 12:08:38 -07: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  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Adam Jackson
							
						 
						
							
							
							
							
								
							
							
								881953813c 
								
							 
						 
						
							
							
								
								Fix the Linux ACPI reopen code to use a repeating timer, rather than a  
							
							 
							
							... 
							
							
							
							one-shot sleep-and-reopen attempt. 
							
						 
						
							2006-07-17 13:50:38 -04:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Ian Romanick
							
						 
						
							
							
							
							
								
							
							
								d3ee49bcba 
								
							 
						 
						
							
							
								
								Refactor common code from the generic.c and linux.c version of  
							
							 
							
							... 
							
							
							
							xf86ExtendedInitInt10 to xf86int10GetBiosLocationType and
xf86int10GetBiosSegment.
These changes were tested on MGA hardware on x86-64 with various
combinations of InitPrimary and BiosLocation. 
							
						 
						
							2006-07-14 15:13:35 -07:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Ian Romanick
							
						 
						
							
							
							
							
								
							
							
								8793c7fd4b 
								
							 
						 
						
							
							
								
								Refactor identical xf86InitInt10 function from generic.c and linux.c  
							
							 
							
							... 
							
							
							
							to helper_exec.c. 
							
						 
						
							2006-07-14 09:11:39 -07:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Tilman Sauerbeck
							
						 
						
							
							
							
							
								
							
							
								39b2f7b218 
								
							 
						 
						
							
							
								
								Bug  #3042 : Use autoconf to get the correct name of a struct member.  
							
							 
							
							... 
							
							
							
							This allows us to remove the kernel version ifdefs from the code, which
are ugly and broken. 
							
						 
						
							2006-07-08 19:55:53 +02:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Adam Jackson
							
						 
						
							
							
							
							
								
							
							
								d7a96dd6f1 
								
							 
						 
						
							
							
								
								Switch the default mouse device on Linux to /dev/input/mice.  
							
							 
							
							
							
						 
						
							2006-07-06 17:39:14 -04:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Eric Anholt
							
						 
						
							
							
							
							
								
							
							
								002e28c12c 
								
							 
						 
						
							
							
								
								Correct AGP memory deallocation argument on *BSD.  
							
							 
							
							... 
							
							
							
							This fixes leaks and eventual crashes with RandR resizing on Intel. 
							
						 
						
							2006-07-03 12:48:12 -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
							
						 
						
							
							
							
							
								
							
							
								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  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Adam Jackson
							
						 
						
							
							
							
							
								
							
							
								c11cfcfaff 
								
							 
						 
						
							
							
								
								Bug  #6377 : Ignore disabled BARs, and allow matching BARs aligned to less  
							
							 
							
							... 
							
							
							
							than 16 bytes. (Felix Kühling, ATI) 
							
						 
						
							2006-05-18 23:48:57 +00:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Adam Jackson
							
						 
						
							
							
							
							
								
							
							
								fa9a49a92d 
								
							 
						 
						
							
							
								
								Bug  #5877 : Avoid burning CPU when acpid dies. Require acpid to be running  
							
							 
							
							... 
							
							
							
							for ACPI support on Linux. Minor errno handling fixes. (Valery
    Inozemtsev, Adam Jackson) 
							
						 
						
							2006-05-18 18:18:41 +00:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Adam Jackson
							
						 
						
							
							
							
							
								
							
							
								321dbed5f5 
								
							 
						 
						
							
							
								
								Bug  #5209 : Fix APM/ACPI support, again. (Michel Dänzer, Valery Inozemtsev)  
							
							 
							
							
							
						 
						
							2006-05-15 18:27:18 +00:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Adam Jackson
							
						 
						
							
							
							
							
								
							
							
								86ffb46358 
								
							 
						 
						
							
							
								
								Bug  #5209 : Re-enable building APM and ACPI support. (Michel Dänzer)  
							
							 
							
							
							
						 
						
							2006-05-09 18:04:29 +00:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Benjamin Herrenschmidt
							
						 
						
							
							
							
							
								
							
							
								79dc689261 
								
							 
						 
						
							
							
								
								When reading the kernel keyboard mapping (readKernelMapping in  
							
							 
							
							... 
							
							
							
							os-support/linux/lnx_KbdMap.c) we overrun the usefully-named global
    array 'map', scribbling on other random static variables elsewhere.
    This is fixed by changing the size of at2lnx. (David Woodhouse). Bug
    #5169  
							
						 
						
							2006-04-22 03:22:17 +00:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Adam Jackson
							
						 
						
							
							
							
							
								
							
							
								a68c11bb1d 
								
							 
						 
						
							
							
								
								Mark everything in xf86sym.c as _X_EXPORT.  
							
							 
							
							
							
						 
						
							2006-03-25 19:52:05 +00:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Benjamin Herrenschmidt
							
						 
						
							
							
							
							
								
							
							
								1a4f20541a 
								
							 
						 
						
							
							
								
								Fix linux build without libc wrappers (From Fredrik Höglund)  
							
							 
							
							
							
						 
						
							2006-02-13 04:56:27 +00:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Eric Anholt
							
						 
						
							
							
							
							
								
							
							
								c3d1403672 
								
							 
						 
						
							
							
								
								Remove libcwrapper usage from xorg server modules. The libcwrapper is only  
							
							 
							
							... 
							
							
							
							of (marginal) use in the drivers, and that usage remains. 
							
						 
						
							2006-02-10 22:00:30 +00:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Adam Jackson
							
						 
						
							
							
							
							
								
							
							
								f1ba3b4f33 
								
							 
						 
						
							
							
								
								Bug  #4718 : Command line flag to disable ACPI.  
							
							 
							
							
							
						 
						
							2005-12-14 20:11:16 +00:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Adam Jackson
							
						 
						
							
							
							
							
								
							
							
								f9ccebe8c5 
								
							 
						 
						
							
							
								
								Bug  #4928 : Fix compilation for Alpha. (Stefaan DeRoeck)  
							
							 
							
							
							
						 
						
							2005-12-08 19:27:13 +00:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Kevin E Martin
							
						 
						
							
							
							
							
								
							
							
								7c00afd0ec 
								
							 
						 
						
							
							
								
								Define XFree86Server only where it is required.  
							
							 
							
							
							
						 
						
							2005-12-02 06:02:45 +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  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Adam Jackson
							
						 
						
							
							
							
							
								
							
							
								e3ec048ff2 
								
							 
						 
						
							
							
								
								Bug  #4928 : Unbreak Makefile.am for Alpha chips. (Stefan DeRoeck)  
							
							 
							
							
							
						 
						
							2005-11-18 22:43:50 +00:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Kevin E Martin
							
						 
						
							
							
							
							
								
							
							
								56101c9d6e 
								
							 
						 
						
							
							
								
								Fix fd leak by closing them in the ACPI code instead of just using  
							
							 
							
							... 
							
							
							
							shutdown. 
							
						 
						
							2005-10-31 05:45:40 +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 Hourihane
							
						 
						
							
							
							
							
								
							
							
								57abb5b171 
								
							 
						 
						
							
							
								
								remove reference to non-existent agpgart.h  
							
							 
							
							
							
						 
						
							2005-10-14 08:29:16 +00:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Luc Verhaegen
							
						 
						
							
							
							
							
								
							
							
								9f3ad65251 
								
							 
						 
						
							
							
								
								Fix lnx_pci.c's xf86GetOSOffsetFromPCI return value. Clears up the resource  
							
							 
							
							... 
							
							
							
							ranges awkwardness and the "INVALID MEM ALLOCATION" warning. 
							
						 
						
							2005-10-05 07:27:52 +00:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Alan Coopersmith
							
						 
						
							
							
							
							
								
							
							
								6d4b350dee 
								
							 
						 
						
							
							
								
								Bug  #3815  < https://bugs.freedesktop.org/show_bug.cgi?id=3815 > Patch  #3463  
							
							 
							
							... 
							
							
							
							<https://bugs.freedesktop.org/attachment.cgi?id=3463 > GNU/kFreeBSD
    Xserver support (Robert Millan) 
							
						 
						
							2005-10-03 16:46:14 +00:00