0ac1755977 
								
							 
						 
						
							
							
								
								Merge branch 'master' into mpx  
							
							... 
							
							
							
							Conflicts:
	Xext/sampleEVI.c 
							
						 
						
							2008-01-26 13:55:07 +10:30 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								734e115871 
								
							 
						 
						
							
							
								
								Bug  #12439 : add a quirk to use +hsync +vsync for the probed detailed mode.  
							
							... 
							
							
							
							Samsung 205BW quirk is somehow reworked. 
							
						 
						
							2008-01-23 21:24:09 +08:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								1f83f40525 
								
							 
						 
						
							
							
								
								xf86Cursors: fix memset for non-square cursors  
							
							
							
						 
						
							2008-01-15 10:21:17 +10:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								38bf01bd1c 
								
							 
						 
						
							
							
								
								Merge branch 'master' into mpx  
							
							
							
						 
						
							2008-01-10 13:38:46 +10:30 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								20eb26f9d1 
								
							 
						 
						
							
							
								
								Fix potential crasher in xf86CrtcRotate()  
							
							... 
							
							
							
							xf86CrtcRotate() is called by randr 1.2 drivers via xf86CrtcSetMode() or xf86SetDesiredModes()
during ScreenInit() at which point pScrn->pScreen is not set. If a user specifies a rotation
in their config file pScrn->pScreen is dereferenced and boom. 
							
						 
						
							2008-01-03 22:53:36 -05:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								8da83836b6 
								
							 
						 
						
							
							
								
								Merge branch 'master' into mpx  
							
							... 
							
							
							
							Conflicts:
	XTrap/xtrapddmi.c
	Xext/security.c
	Xext/xprint.c
	Xext/xtest.c
	Xext/xvdisp.c
	Xi/exevents.c
	Xi/grabdevb.c
	Xi/grabdevk.c
	Xi/opendev.c
	Xi/ungrdev.c
	Xi/ungrdevb.c
	Xi/ungrdevk.c
	dix/cursor.c
	dix/devices.c
	dix/dixutils.c
	dix/events.c
	dix/getevents.c
	dix/main.c
	dix/window.c
	hw/xfree86/ramdac/xf86Cursor.c
	include/dix.h
	include/input.h
	include/inputstr.h
	mi/midispcur.c
	mi/miinitext.c
	mi/misprite.c
	render/animcur.c
	xfixes/cursor.c
	xkb/xkbAccessX.c 
							
						 
						
							2008-01-03 17:04:54 +10:30 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								312b30cb03 
								
							 
						 
						
							
							
								
								EDID 1.4: First detailed mode is always preferred.  
							
							... 
							
							
							
							... so act like it in the modelist generator, not just the parser. 
							
						 
						
							2007-12-28 17:38:51 -05:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								a948216dcc 
								
							 
						 
						
							
							
								
								EDID 1.4: Decode CVT 3-byte codes and add them to the mode pool.  
							
							... 
							
							
							
							Section 3.10.3.8: CVT 3 Byte Code Descriptor Definition. 
							
						 
						
							2007-12-28 16:53:16 -05:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								938da5ee38 
								
							 
						 
						
							
							
								
								Add HDMI and DisplayPort connector types.  
							
							
							
						 
						
							2007-12-28 12:23:44 -05:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								86b2e59bfb 
								
							 
						 
						
							
							
								
								Merge branch 'master' into XACE-SELINUX  
							
							... 
							
							
							
							Conflicts:
	configure.ac
This is the last pull before merging to master. 
							
						 
						
							2007-12-14 00:32:24 -05:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								c8feb73f58 
								
							 
						 
						
							
							
								
								Merge branch 'master' into XACE-SELINUX  
							
							... 
							
							
							
							Conflicts:
	Xext/EVI.c
	Xext/bigreq.c
	Xext/cup.c
	Xext/dpms.c
	Xext/fontcache.c
	Xext/mitmisc.c
	Xext/xcmisc.c
	Xext/xf86bigfont.c
	Xext/xtest.c
	configure.ac
	dbe/dbe.c
	hw/darwin/darwin.h
	hw/darwin/darwinEvents.c
	hw/darwin/iokit/xfIOKit.h
	hw/darwin/iokit/xfIOKitCursor.c
	hw/darwin/quartz/fullscreen/fullscreen.c
	hw/darwin/quartz/fullscreen/quartzCursor.c
	hw/darwin/quartz/quartz.c
	hw/darwin/quartz/quartzCommon.h
	hw/darwin/quartz/quartzCursor.c
	hw/darwin/quartz/xpr/dri.c
	hw/darwin/quartz/xpr/dristruct.h
	hw/darwin/quartz/xpr/xprCursor.c
	hw/darwin/quartz/xpr/xprFrame.c
	hw/xfree86/modes/xf86RandR12.c
	include/cursor.h
	miext/rootless/rootlessCommon.h
	miext/rootless/rootlessScreen.c
	miext/rootless/rootlessWindow.c
	render/picturestr.h
Trying to pick up the pieces from the darwin churn here... 
							
						 
						
							2007-12-13 18:38:25 -05:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								efcdc0d701 
								
							 
						 
						
							
							
								
								Correct the documentation comments in xf86Modes.c  
							
							... 
							
							
							
							Most of those functions do not, in fact, work with circular mode lists,
and by this point the API isn't really "proposed" anymore. 
							
						 
						
							2007-12-13 15:38:41 -05:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								1768af38c7 
								
							 
						 
						
							
							
								
								Add infrastructure for validating modes by memory bandwidth.  
							
							
							
						 
						
							2007-12-13 15:06:18 -05:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								4359193aaa 
								
							 
						 
						
							
							
								
								Explain a confusing #ifdef.  
							
							
							
						 
						
							2007-12-13 10:59:48 -05:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								c6cfcd408d 
								
							 
						 
						
							
							
								
								Bug 13308: Verify and reject obviously broken modes.  
							
							
							
						 
						
							2007-12-05 17:48:28 +01:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								678f786715 
								
							 
						 
						
							
							
								
								xf86crtc: oh mon could be NULL, so check before quirks  
							
							
							
						 
						
							2007-12-04 12:24:47 +11:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								a9df4bb555 
								
							 
						 
						
							
							
								
								xf86Crtc: pass correct parameter.  
							
							... 
							
							
							
							quite how this has worked I've no idea. 
							
						 
						
							2007-12-04 12:17:29 +11:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								f30abe30c5 
								
							 
						 
						
							
							
								
								edid quirk for MAX 0x77e monitor  
							
							... 
							
							
							
							From RH bugzilla 306441 
							
						 
						
							2007-11-30 13:53:21 +10:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								89c3dfe41e 
								
							 
						 
						
							
							
								
								modes: use xf86RandR12Index to stop illegal access  
							
							... 
							
							
							
							xf86RandR12Index set to -1, and if initialised it gets 0 or higher.
This allows the server to start with xinerama turned on with only one head 
							
						 
						
							2007-11-29 19:57:24 +11:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								725710fd0b 
								
							 
						 
						
							
							
								
								randr: make randr code not segfault when xinerama set  
							
							
							
						 
						
							2007-11-29 19:40:53 +11:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								23b8ca8a37 
								
							 
						 
						
							
							
								
								RANDR 1.2: Only enable unknown outputs if there are no connected outputs.  
							
							... 
							
							
							
							Otherwise you end up with a confusing initial geometry, and xscreensaver
and friends get very angry. 
							
						 
						
							2007-11-27 13:20:40 -05:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								c6c284e64b 
								
							 
						 
						
							
							
								
								Initialize Mode with 0 in xf86RandRModeConvert.  
							
							... 
							
							
							
							Asking for trouble if non-initialized values contain random data. 
							
						 
						
							2007-11-26 15:39:42 +01:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								f6401f944d 
								
							 
						 
						
							
							
								
								Don't segfault if referring to a relative output where no modes survived.  
							
							
							
						 
						
							2007-11-23 16:14:48 +01:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								fa19e84714 
								
							 
						 
						
							
							
								
								Fix initial placement of LeftOf and Above.  
							
							
							
						 
						
							2007-11-23 16:14:48 +01:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								184e571957 
								
							 
						 
						
							
							
								
								Adjust offsets of modes that do not fit virtual screen size.  
							
							... 
							
							
							
							Fixes memory corruption if a too small "Virtual" was specified in xorg.conf
for the selected multi-monitor configuration. 
							
						 
						
							2007-11-23 16:14:48 +01:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								2d17f47cc7 
								
							 
						 
						
							
							
								
								Merge branch 'master' into XACE-SELINUX  
							
							... 
							
							
							
							Conflicts:
	hw/xnest/Pixmap.c
	include/dix.h 
							
						 
						
							2007-11-19 18:10:46 -05:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								ea9c63e93b 
								
							 
						 
						
							
							
								
								DEFAULT_DPI was undefined here.  
							
							
							
						 
						
							2007-11-19 15:53:49 +01:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								ee2d4626dc 
								
							 
						 
						
							
							
								
								Bug  #12932 : Use DEFAULT_DPI in randr1.2 instead of hardcoded 96.  
							
							
							
						 
						
							2007-11-18 11:56:31 -05:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								0b729051c0 
								
							 
						 
						
							
							
								
								Merge branch 'master' into mpx  
							
							... 
							
							
							
							Conflicts:
	Xi/extinit.c
	Xi/grabdev.c
	Xi/setmode.c
	Xi/ungrdev.c
	dix/devices.c
	dix/events.c
	dix/getevents.c
	include/dix.h
	mi/midispcur.c
	mi/misprite.c
	xkb/xkbActions.c
	xkb/xkbEvents.c
	xkb/xkbPrKeyEv.c 
							
						 
						
							2007-11-07 15:37:23 +10:30 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								a52c9b2a59 
								
							 
						 
						
							
							
								
								Merge branch 'master' into XACE-SELINUX  
							
							... 
							
							
							
							Conflicts:
	dix/dispatch.c
	dix/property.c
	hw/xfree86/common/xf86VidMode.c
	include/xkbsrv.h
	render/glyph.c
	xkb/xkbActions.c 
							
						 
						
							2007-11-05 19:08:36 -05:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								733d42065f 
								
							 
						 
						
							
							
								
								XFree86: Remove usage of alloca  
							
							... 
							
							
							
							Replace with heap allocations. 
							
						 
						
							2007-11-05 14:34:42 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								4d0f35c81d 
								
							 
						 
						
							
							
								
								Always duplicate mode name when duplicating a mode.  
							
							... 
							
							
							
							If the originating mode didn't have a name, we would end up with the name of
the original mode being setup correctly, but with the name of the copy still
being NULL. 
							
						 
						
							2007-11-02 19:27:32 +01:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								27b13eeb56 
								
							 
						 
						
							
							
								
								Nuke superfluous ",", added missing include for xf86i2c.h.  
							
							
							
						 
						
							2007-10-26 13:15:07 +02:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								b633d54b94 
								
							 
						 
						
							
							
								
								Merge branch 'master' into XACE-SELINUX  
							
							... 
							
							
							
							Conflicts:
	GL/glx/glxscreens.c
	hw/xnest/Screen.c
	render/glyph.c
	render/glyphstr.h
	render/render.c 
							
						 
						
							2007-10-25 12:19:30 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								48ca5961ca 
								
							 
						 
						
							
							
								
								Prefer configured DisplaySize to probed DDC data, if available.  
							
							... 
							
							
							
							Based on patch by Hong Liu <hong.liu@intel.com>. 
							
						 
						
							2007-10-24 20:31:51 +02:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								29e0e18072 
								
							 
						 
						
							
							
								
								Leave hardware-specified preferred modes alone when user preference exists.  
							
							... 
							
							
							
							Instead of removing the preference bit marking the hardware declared mode
preference, leave it in place and just move the user preferred mode to the
front of the list while marking it with the USERPREF bit which will cause it
to be selected by the initial mode selection code. 
							
						 
						
							2007-10-22 13:38:16 -07:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								ab4bce02a9 
								
							 
						 
						
							
							
								
								Add a quirk for Philips 107P5 which lacks the preferred bit on detailed timing.  
							
							... 
							
							
							
							Also fix the prefer-large-75 quirk if the prefer-first-detailed bit was set,
though it's not the case for the existing prefer-large-75 consumer. 
							
						 
						
							2007-10-18 15:22:42 -07:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								c3f7b86255 
								
							 
						 
						
							
							
								
								Merge branch 'master' into XACE-SELINUX  
							
							... 
							
							
							
							Conflicts:
	os/access.c 
							
						 
						
							2007-10-17 15:00:54 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								feac075952 
								
							 
						 
						
							
							
								
								Make config file preferred mode override monitor preferred mode.  
							
							... 
							
							
							
							Add a new even-more-preferred bit to each mode which is used to make config
file preferences selected instead of the monitor preferred mode. 
							
						 
						
							2007-10-17 11:42:28 +08:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								fc092334ac 
								
							 
						 
						
							
							
								
								Bug #10304,12784,11603: Add quirks for several physical size issues.  
							
							... 
							
							
							
							A lot of EDID writers apparently end up stuffing centimeters (like the
maximum image size field) into the detailed timings, instead of millimeters.
Some of them only get it wrong in one direction.  Also, add a quirk to let
us mark the largest 75hz mode as preferred, which will often be used for
EDID 1.0 CRTs. 
							
						 
						
							2007-10-11 16:55:44 -07:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								45cc03726b 
								
							 
						 
						
							
							
								
								Make mode checking more tolerant like in pre-RandR times.  
							
							
							
						 
						
							2007-10-11 18:59:39 +02:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								27612748e0 
								
							 
						 
						
							
							
								
								Merge branch 'master' into XACE-SELINUX  
							
							... 
							
							
							
							Conflicts:
	dix/devices.c 
							
						 
						
							2007-09-26 07:47:29 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								e1860f241b 
								
							 
						 
						
							
							
								
								Document xf86_crtc_clip_video_helper better.  
							
							
							
						 
						
							2007-09-22 17:54:51 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								19d30c1c77 
								
							 
						 
						
							
							
								
								Revert "Fix possible crash if Xv window is outside of either crtc"  
							
							... 
							
							
							
							This reverts commit 9235531410 
							
						 
						
							2007-09-22 17:51:27 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								9235531410 
								
							 
						 
						
							
							
								
								Fix possible crash if Xv window is outside of either crtc  
							
							
							
						 
						
							2007-09-22 14:25:02 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								47ab4d648b 
								
							 
						 
						
							
							
								
								devPrivates rework: convert CursorRec and CursorBits over to new interface.  
							
							
							
						 
						
							2007-08-30 11:40:39 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								4017d31902 
								
							 
						 
						
							
							
								
								devPrivates rework: since API is already broken, switch everything  
							
							... 
							
							
							
							over to new system.
Need to update documentation and address some remaining vestiges of
old system such as CursorRec structure, fb "offman" structure, and
FontRec privates. 
							
						 
						
							2007-08-28 09:28:25 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								76bf3cd7b8 
								
							 
						 
						
							
							
								
								randr: fixup crtc and output destroy  
							
							... 
							
							
							
							if you are moving pointers, you want to move the pointers not just a byte 
							
						 
						
							2007-08-23 16:22:03 +10:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								81f8b652d9 
								
							 
						 
						
							
							
								
								Add _X_EXPORT to exported functions in hw/xfree86/modes/*  
							
							... 
							
							
							
							Also add missing exports to hw/xfree86/loader/xf86sym.c 
							
						 
						
							2007-08-22 19:26:34 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								265a633cf1 
								
							 
						 
						
							
							
								
								Screen size changing should leave FB alone when X is inactive.  
							
							... 
							
							
							
							xf86RandR12ScreenSetSize must protect calls to EnableDisableFBAccess with
suitable vtSema checks to avoid invoking driver code while the X server is
inactive. 
							
						 
						
							2007-08-20 23:24:22 -07:00