xserver: Branch 'master'

[Matthias Hopf]

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

New commits:
commit d41b8960be8ad316504ef5657c0abfe6d76d3b5e
Author: Matthias Hopf <mhopf at suse.de>
Date:   Thu Dec 11 18:48:02 2008 +0100

    randr: Fix initial panning border copy
    
    Thanks to Julien Cristau for finding this.

diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index 8e6cef0..6b37a72 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -1348,7 +1348,10 @@ xf86InitialPanning (ScrnInfoPtr scrn)
 			&track_width, &track_height, &track_left, &track_top,
 			&brdr[0], &brdr[1], &brdr[2], &brdr[3])) {
 	case 12:
-	    memcpy (output->initialBorder, brdr, 4*sizeof(INT16));
+	    output->initialBorder[0] = brdr[0];
+	    output->initialBorder[1] = brdr[1];
+	    output->initialBorder[2] = brdr[2];
+	    output->initialBorder[3] = brdr[3];
 	    /* fall through */
 	case 8:
 	    output->initialTrackingArea.x1 = track_left;