xserver: Branch 'master'

[Julien Cristau]

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

New commits:
commit 82c4075d4ba3bea03341c80b754b0f9d2f62a826
Author: Julien Cristau <jcristau at debian.org>
Date:   Mon May 19 03:15:11 2008 +0200

    xfree86: fix initial output positions with Above or LeftOf and rotation
    
    The fix in fa19e84714aa84a2f2e817e363d6440349d0b619 was incomplete,
    as it was still using the wrong output's initial rotation to compute
    the position.

diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index 58c3512..9512805 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -1137,10 +1137,10 @@ xf86InitialOutputPositions (ScrnInfoPtr scrn, DisplayModePtr *modes)
 		    output->initial_x += xf86ModeWidth (modes[or], relative->initial_rotation);
 		    break;
 		case OPTION_ABOVE:
-		    output->initial_y -= xf86ModeHeight (modes[o], relative->initial_rotation);
+		    output->initial_y -= xf86ModeHeight (modes[o], output->initial_rotation);
 		    break;
 		case OPTION_LEFT_OF:
-		    output->initial_x -= xf86ModeWidth (modes[o], relative->initial_rotation);
+		    output->initial_x -= xf86ModeWidth (modes[o], output->initial_rotation);
 		    break;
 		default:
 		    break;