xserver: Branch 'master' - 3 commits

[Keith Packard]

 hw/xfree86/man/xorg.conf.man |    4 +++-
 hw/xfree86/modes/xf86Crtc.c  |   25 ++++++++++++++++++++-----
 hw/xwin/man/XWinrc.man       |   10 +++++-----
 3 files changed, 28 insertions(+), 11 deletions(-)

New commits:
commit e4787ec20b1b9d30fe00f17b60eb0898190bf77d
Author: Gaetan Nadon <memsize at videotron.ca>
Date:   Mon Oct 17 15:08:14 2011 -0400

    XWinrc.man: fix warning: tab character in unquoted macro argument #35054
    
    Spaces or tabs do not affect the text output layout.
    
    Reviewed-by: Jeremy Huddleston <jeremyhu at apple.com>
    Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xwin/man/XWinrc.man b/hw/xwin/man/XWinrc.man
index e4c454f..71d8dad 100644
--- a/hw/xwin/man/XWinrc.man
+++ b/hw/xwin/man/XWinrc.man
@@ -88,15 +88,15 @@ this may be useful if you want no dialogs.
 This instruction defines a menu and asigns a \fIMenu_Name\fP to it.
 \fIMenu_Item_Line\fP are lines  of any of the following types:
 .TP 8
-.B \t SEPARATOR
+.B SEPARATOR
 .TP 8
-.B  \t \fIItem_Label\fP  EXEC \fICommand\fP
+.B \fIItem_Label\fP  EXEC \fICommand\fP
 .TP 8
-.B \t \fIItem_Label\fP  MENU \fIpreviously-defined-menu-name\fP
+.B \fIItem_Label\fP  MENU \fIpreviously-defined-menu-name\fP
 .TP 8
-.B \t \fIItem_Label\fP  ALWAYSONTOP
+.B \fIItem_Label\fP  ALWAYSONTOP
 .TP 8
-.B \t \fIItem_Label\fP  RELOAD
+.B \fIItem_Label\fP  RELOAD
 .br
 The \fIItem_Label\fP is the string that is written in the menu item.
 .br
commit 321873f8045139edd47b526a765f8b1c66f53cd4
Author: Gaetan Nadon <memsize at videotron.ca>
Date:   Mon Oct 17 15:08:13 2011 -0400

    xorg.conf.man: fix 382: warning: missing `)' (got `R') #35054
    
    http://www.gnu.org/software/groff/manual/html_node/Man-usage.html
    
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man
index 7f98851..996798f 100644
--- a/hw/xfree86/man/xorg.conf.man
+++ b/hw/xfree86/man/xorg.conf.man
@@ -379,7 +379,9 @@ is a number used to order the fontfile FPEs. Examples:
 .I misc:unscaled:pri=10 \-> /usr/share/X11/fonts/misc
 .fi
 .PP
-.RE .RE .RE
+.RE
+.RE
+.RE
 .PP
 .RS 7
 Font server identifiers:
commit 3e145d3d67b472cb5d74cb8078b614160c4722b7
Author: Jesse Barnes <jbarnes at virtuousgeek.org>
Date:   Thu Oct 13 12:01:10 2011 -0700

    crtc: match full preferred modes if possible when choosing an initial config
    
    It's fairly common to have multiple, identical monitors plugged in.  In
    that case, it's preferable to run the monitor's preferred mode on each
    output, rather than just matching the width & height and end up with
    different timings or refresh rates.
    
    Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
    Reviewed-by: Keith Packard <keithp at keithp.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index cbe0b5c..384d8b4 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -2060,13 +2060,28 @@ xf86TargetPreferred(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,
 		if (o == p)
 		    continue;
 
-		for (mode = output->probed_modes; mode; mode = mode->next) {
-		    Rotation r = output->initial_rotation;
-		    if (xf86ModeWidth(mode, r) == pref_width &&
-			    xf86ModeHeight(mode, r) == pref_height) {
+		/*
+		 * First see if the preferred mode matches on the next
+		 * output as well.  This catches the common case of identical
+		 * monitors and makes sure they all have the same timings
+		 * and refresh.  If that fails, we fall back to trying to
+		 * match just width & height.
+		 */
+		mode = xf86OutputHasPreferredMode(output, pref_width,
+						  pref_height);
+		if (mode && xf86ModesEqual(mode, preferred[p])) {
 			preferred[o] = mode;
 			match = TRUE;
-		    }
+		} else {
+			for (mode = output->probed_modes; mode;
+			     mode = mode->next) {
+				Rotation r = output->initial_rotation;
+				if (xf86ModeWidth(mode, r) == pref_width &&
+				    xf86ModeHeight(mode, r) == pref_height) {
+					preferred[o] = mode;
+					match = TRUE;
+				}
+			}
 		}
 
 		all_match &= match;