aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xfree86
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-07-01 06:37:06 +0000
committermarha <marha@users.sourceforge.net>2010-07-01 06:37:06 +0000
commit87559ccfc67a98a75fa8068066871c35caa88e30 (patch)
tree2bf313d2ae1adb6840cff8e62ccce5f984af142a /xorg-server/hw/xfree86
parent644d0b3793014483679c9ae0d45a972484c10cb9 (diff)
downloadvcxsrv-87559ccfc67a98a75fa8068066871c35caa88e30.tar.gz
vcxsrv-87559ccfc67a98a75fa8068066871c35caa88e30.tar.bz2
vcxsrv-87559ccfc67a98a75fa8068066871c35caa88e30.zip
git update 1/7/2010
Diffstat (limited to 'xorg-server/hw/xfree86')
-rw-r--r--xorg-server/hw/xfree86/modes/xf86Crtc.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/xorg-server/hw/xfree86/modes/xf86Crtc.c b/xorg-server/hw/xfree86/modes/xf86Crtc.c
index 6a56e31cc..beb9be66e 100644
--- a/xorg-server/hw/xfree86/modes/xf86Crtc.c
+++ b/xorg-server/hw/xfree86/modes/xf86Crtc.c
@@ -572,8 +572,11 @@ xf86OutputInitialRotation (xf86OutputPtr output)
OPTION_ROTATE);
int i;
- if (!rotate_name)
+ if (!rotate_name) {
+ if (output->initial_rotation)
+ return output->initial_rotation;
return RR_Rotate_0;
+ }
for (i = 0; i < 4; i++)
if (xf86nameCompare (direction[i], rotate_name) == 0)