summaryrefslogtreecommitdiff
authorDave Airlie <airlied@redhat.com>2009-10-01 05:25:55 (GMT)
committer Peter Hutterer <peter.hutterer@who-t.net>2009-10-02 02:15:58 (GMT)
commit3ebb82d61c2b56e8f7145443a552a4e913bbfc80 (patch) (side-by-side diff)
tree47d2463188f1108e1994bd78261b581b47b9a010
parentcb54cf1b3e8c4109541cfb698542c00f2473e731 (diff)
downloadxserver-3ebb82d61c2b56e8f7145443a552a4e913bbfc80.zip
xserver-3ebb82d61c2b56e8f7145443a552a4e913bbfc80.tar.gz
rotate: drop unwrapping inside block handler.
Keith has shown half the block handlers wrappers are wrong, also dynamic wrapping/unwrapping from what I can see will happen after the drivers, so its really accidental ABI, that we can't change now without modifing drivers. So be safe for 1.7. Signed-off-by: Dave Airlie <airlied@redhat.com> Declared-as-sane-by: Keith Packard <keithp@keithp.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--hw/xfree86/modes/xf86Rotate.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/hw/xfree86/modes/xf86Rotate.c b/hw/xfree86/modes/xf86Rotate.c
index 9e65c99..5de6b0c 100644
--- a/hw/xfree86/modes/xf86Rotate.c
+++ b/hw/xfree86/modes/xf86Rotate.c
@@ -268,13 +268,9 @@ xf86RotateBlockHandler(int screenNum, pointer blockData,
rotation_active = xf86RotateRedisplay(pScreen);
pScreen->BlockHandler = xf86_config->BlockHandler;
(*pScreen->BlockHandler) (screenNum, blockData, pTimeout, pReadmask);
- if (rotation_active) {
- /* Re-wrap if rotation is still happening */
- xf86_config->BlockHandler = pScreen->BlockHandler;
- pScreen->BlockHandler = xf86RotateBlockHandler;
- } else {
- xf86_config->BlockHandler = NULL;
- }
+ /* cannot avoid re-wrapping until all wrapping is audited */
+ xf86_config->BlockHandler = pScreen->BlockHandler;
+ pScreen->BlockHandler = xf86RotateBlockHandler;
}
void