xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/modes/xf86Crtc.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8a6ed44a8b2fc5f14729dc54fec17607ced03859
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Mar 2 14:26:23 2009 -0500

    randr: Fix thinko in xf86TargetPreferred
    
    The only-one-output case would only work right if that also happened to
    be the zeroth output.  Oops.

diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index 7226f4f..7d6feaf 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -2085,9 +2085,9 @@ xf86TargetPreferred(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,
 		     (float)config->output[p]->mm_height;
 
 	if (aspect)
-	    preferred_match[0] = bestModeForAspect(config, enabled, aspect);
+	    preferred_match[p] = bestModeForAspect(config, enabled, aspect);
 
-	if (preferred_match[0])
+	if (preferred_match[p])
 	    ret = TRUE;
 
     } while (0);