diff options
| author | marha <marha@users.sourceforge.net> | 2009-09-02 21:09:13 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-09-02 21:09:13 +0000 |
| commit | 8fedf58693f42869528b41408ac4d6012839e973 (patch) | |
| tree | 62a817bea7dfc71050292d302ba94f5e349c67a7 /xorg-server/hw/xfree86/modes/xf86Crtc.c | |
| parent | ac14083f465166b298162a57fff0bad90e528fff (diff) | |
| parent | 6f25a23db1df27e992c34f6fd4c82e83c44fc2e2 (diff) | |
| download | vcxsrv-8fedf58693f42869528b41408ac4d6012839e973.tar.gz vcxsrv-8fedf58693f42869528b41408ac4d6012839e973.tar.bz2 vcxsrv-8fedf58693f42869528b41408ac4d6012839e973.zip | |
svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86/modes/xf86Crtc.c')
| -rw-r--r-- | xorg-server/hw/xfree86/modes/xf86Crtc.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/xorg-server/hw/xfree86/modes/xf86Crtc.c b/xorg-server/hw/xfree86/modes/xf86Crtc.c index 84d3cac3e..e9bde36e3 100644 --- a/xorg-server/hw/xfree86/modes/xf86Crtc.c +++ b/xorg-server/hw/xfree86/modes/xf86Crtc.c @@ -255,9 +255,6 @@ xf86CrtcSetModeTransform (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotati RRTransformRec saved_transform; Bool saved_transform_present; - if (crtc->funcs->set_mode_major) - return crtc->funcs->set_mode_major(crtc, mode, rotation, x, y); - crtc->enabled = xf86CrtcInUse (crtc); if (!crtc->enabled) @@ -268,7 +265,6 @@ xf86CrtcSetModeTransform (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotati adjusted_mode = xf86DuplicateMode(mode); - didLock = crtc->funcs->lock (crtc); saved_mode = crtc->mode; saved_x = crtc->x; @@ -293,19 +289,12 @@ xf86CrtcSetModeTransform (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotati } else crtc->transformPresent = FALSE; - if (crtc->funcs->set_origin && - memcmp (mode, &saved_mode, sizeof(saved_mode)) == 0 && - saved_rotation == rotation && - saved_transform_present == crtc->transformPresent && - (!crtc->transformPresent || RRTransformEqual(&saved_transform, &crtc->transform))) - { - if (!xf86CrtcRotate (crtc)) - goto done; - crtc->funcs->set_origin (crtc, crtc->x, crtc->y); - ret = TRUE; + if (crtc->funcs->set_mode_major) { + ret = crtc->funcs->set_mode_major(crtc, mode, rotation, x, y); goto done; } + didLock = crtc->funcs->lock (crtc); /* Pass our mode to the outputs and the CRTC to give them a chance to * adjust it according to limitations or output properties, and also * a chance to reject the mode entirely. |