xserver: Branch 'master' - 3 commits

[Eric Anholt]

 hw/xfree86/doc/man/xorg.conf.man.pre |   20 ++++++++++++++------
 hw/xfree86/modes/xf86EdidModes.c     |   14 ++++++++++----
 2 files changed, 24 insertions(+), 10 deletions(-)

New commits:
diff-tree 00e8295b7e0c7c0ba97707903004272818e3d87d (from 667e95f2e8389d9f23c50446d6d664eddd16d260)
Author: Gero Mudersbach <geroxp at web.de>
Date:   Mon Jul 2 11:40:11 2007 -0700

    Bug #10814: Add needed quirk for Samsung 225BW like the 226BW.

diff --git a/hw/xfree86/modes/xf86EdidModes.c b/hw/xfree86/modes/xf86EdidModes.c
index 5a6faa2..2232992 100644
--- a/hw/xfree86/modes/xf86EdidModes.c
+++ b/hw/xfree86/modes/xf86EdidModes.c
@@ -92,11 +92,16 @@ static Bool quirk_prefer_large_60 (int s
 	DDC->vendor.prod_id == 44358)
 	return TRUE;
 
-    /* Samsung SyncMaster 226BW */
+    /* Bug #10814: Samsung SyncMaster 225BW */
+    if (memcmp (DDC->vendor.name, "SAM", 4) == 0 &&
+	DDC->vendor.prod_id == 596)
+	return TRUE;
+
+    /* Bug #10545: Samsung SyncMaster 226BW */
     if (memcmp (DDC->vendor.name, "SAM", 4) == 0 &&
 	DDC->vendor.prod_id == 638)
 	return TRUE;
-    
+
     return FALSE;
 }
 
diff-tree 667e95f2e8389d9f23c50446d6d664eddd16d260 (from 3de1f0d03b329b01856f664651db23ffefb58646)
Author: Eric Anholt <eric at anholt.net>
Date:   Mon Jul 2 11:36:11 2007 -0700

    Correct the xf86EdidModes.c file description.

diff --git a/hw/xfree86/modes/xf86EdidModes.c b/hw/xfree86/modes/xf86EdidModes.c
index a9f9ddc..5a6faa2 100644
--- a/hw/xfree86/modes/xf86EdidModes.c
+++ b/hw/xfree86/modes/xf86EdidModes.c
@@ -22,8 +22,9 @@
  */
 
 /**
- * @file This is a copy of edid_modes.c from the X Server, for compatibility
- * with old X Servers.
+ * @file This file covers code to convert a xf86MonPtr containing EDID-probed
+ * information into a list of modes, including applying monitor-specific
+ * quirks to fix broken EDID data.
  */
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
diff-tree 3de1f0d03b329b01856f664651db23ffefb58646 (from 4d76075dbb618a47ff9fc15c4be2e2d34210fa8d)
Author: Eric Anholt <eric at anholt.net>
Date:   Tue May 29 10:08:58 2007 -0700

    Fix documentation of association of outputs to monitor sections in xorg.conf(5)

diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
index 4103974..504e0c2 100644
--- a/hw/xfree86/doc/man/xorg.conf.man.pre
+++ b/hw/xfree86/doc/man/xorg.conf.man.pre
@@ -1131,14 +1131,22 @@ monitor, monitor-specific
 .BR Options ,
 and information about the video modes to use with the monitor.
 .PP
-With RandR 1.2-enabled drivers, monitor sections are tied to specific outputs 
-of the video card.
-Each output has a name, and the server will look for a Monitor named
-.B \*qMonitor-outputname\*q
-for configuration of that output (for example, 
-.B \*qMonitor-VGA\*q
+With RandR 1.2-enabled drivers, monitor sections may be tied to specific
+outputs of the video card.  Using the name of the output defined by the video
+driver plus the identifier of a monitor section, one associates a monitor
+section with an output by adding an option to the Device section in the
+following format:
+
+.B Option \*qMonitor-outputname\*q \*qmonitorsection\*q
+
+(for example, 
+.B Option \*qMonitor-VGA\*q \*qVGA monitor\*q
 for a VGA output)
 .PP
+In the absence of specific association of monitor sections to outputs, if a
+monitor section is present the server will associate it with an output to
+preserve compatibility for previous single-head configurations.
+.PP
 Specifying video modes is optional because the server will use the DDC or other
 information provided by the monitor to automatically configure the list of
 modes available.