diff options
| author | Keith Packard <keithp@keithp.com> | 2009-08-25 16:58:07 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2009-08-25 20:12:17 -0700 |
| commit | 31dc4fe0be57da4e9458ee490811fbd92598b7a7 (patch) | |
| tree | 8a27007936f6ef34447fc56cbce4dc21d6765ae5 | |
| parent | cebc0a7aa7a368b2ade3a808195d2e738fda83e9 (diff) | |
Perform rotation redisplay before calling driver block handler (which may flush rendering)
The rotation block handler uses regular driver rendering functions to
repaint the screen, if those functions queue commands in the driver,
it's important that the driver block handler be invoked after the
rotated image is drawn.
Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 1740cda7a37abc7d0a169ab4555b446adaa62211)
| -rw-r--r-- | hw/xfree86/modes/xf86Rotate.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/hw/xfree86/modes/xf86Rotate.c b/hw/xfree86/modes/xf86Rotate.c index 6be77d556..0af96c285 100644 --- a/hw/xfree86/modes/xf86Rotate.c +++ b/hw/xfree86/modes/xf86Rotate.c @@ -263,11 +263,12 @@ xf86RotateBlockHandler(int screenNum, pointer blockData, ScreenPtr pScreen = screenInfo.screens[screenNum]; ScrnInfoPtr pScrn = xf86Screens[screenNum]; xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); + Bool rotation_active; + rotation_active = xf86RotateRedisplay(pScreen); pScreen->BlockHandler = xf86_config->BlockHandler; (*pScreen->BlockHandler) (screenNum, blockData, pTimeout, pReadmask); - if (xf86RotateRedisplay(pScreen)) - { + if (rotation_active) { /* Re-wrap if rotation is still happening */ xf86_config->BlockHandler = pScreen->BlockHandler; pScreen->BlockHandler = xf86RotateBlockHandler; |