diff options
| author | marha <marha@users.sourceforge.net> | 2012-07-12 07:54:33 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-07-12 07:54:33 +0200 |
| commit | 0d90d39cece3eb381fe59941059eca1782b556b4 (patch) | |
| tree | 752bee3a7f4ed2d1a212714fd55be38dbfaeb7a4 /xorg-server/hw/xfree86/modes/xf86Crtc.c | |
| parent | 2bb6be5a068a918bf74a18a41ed1f2537cd68382 (diff) | |
| parent | 165450290d6c26756ede118f52ba2164abce7c9a (diff) | |
| download | vcxsrv-0d90d39cece3eb381fe59941059eca1782b556b4.tar.gz vcxsrv-0d90d39cece3eb381fe59941059eca1782b556b4.tar.bz2 vcxsrv-0d90d39cece3eb381fe59941059eca1782b556b4.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'xorg-server/hw/xfree86/modes/xf86Crtc.c')
| -rw-r--r-- | xorg-server/hw/xfree86/modes/xf86Crtc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xorg-server/hw/xfree86/modes/xf86Crtc.c b/xorg-server/hw/xfree86/modes/xf86Crtc.c index d20152ce6..2628409d2 100644 --- a/xorg-server/hw/xfree86/modes/xf86Crtc.c +++ b/xorg-server/hw/xfree86/modes/xf86Crtc.c @@ -2453,7 +2453,7 @@ xf86InitialConfiguration(ScrnInfoPtr scrn, Bool canGrow) xf86CrtcPtr crtc = crtcs[o]; if (mode && crtc) { - crtc->desiredMode = *mode; + xf86SaveModeContents(&crtc->desiredMode, mode); crtc->desiredRotation = output->initial_rotation; crtc->desiredX = output->initial_x; crtc->desiredY = output->initial_y; @@ -2637,7 +2637,7 @@ xf86SetDesiredModes(ScrnInfoPtr scrn) if (!mode) return FALSE; - crtc->desiredMode = *mode; + xf86SaveModeContents(&crtc->desiredMode, mode); crtc->desiredRotation = RR_Rotate_0; crtc->desiredTransformPresent = FALSE; crtc->desiredX = 0; @@ -2776,7 +2776,7 @@ xf86SetSingleMode(ScrnInfoPtr pScrn, DisplayModePtr desired, Rotation rotation) if (!xf86CrtcSetModeTransform(crtc, crtc_mode, rotation, NULL, 0, 0)) ok = FALSE; else { - crtc->desiredMode = *crtc_mode; + xf86SaveModeContents(&crtc->desiredMode, crtc_mode); crtc->desiredRotation = rotation; crtc->desiredTransformPresent = FALSE; crtc->desiredX = 0; |