xserver: Branch 'server-1.6-branch'
Keith Packard
keithp at kemper.freedesktop.org
Fri Mar 20 17:04:14 PDT 2009
hw/xfree86/modes/xf86Crtc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 667865b9eb98ed73461028b3d38be19619712533
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.
(cherry picked from commit 8a6ed44a8b2fc5f14729dc54fec17607ced03859)
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index f09b9b8..1c2ee49 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -2061,9 +2061,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);
More information about the xorg-commit
mailing list