Commit 68a9ee83 authored by Keith Packard's avatar Keith Packard

Clean up RandR12 bits on screen close (bug 27114)

When resetting the server, pScrn->EnterVT must be unwrapped or the
next server generation will end up wrapping the wrapper and causing an
infinite recursion on EnterVT.
Signed-off-by: Keith Packard's avatarKeith Packard <keithp@keithp.com>
Tested-by: default avatarMichael Stapelberg <michael+freedesktop@stapelberg.de>
parent d5ab7177
......@@ -753,6 +753,8 @@ xf86CrtcCloseScreen (int index, ScreenPtr screen)
crtc->randr_crtc = NULL;
}
xf86RandR12CloseScreen (screen);
return screen->CloseScreen (index, screen);
}
......
......@@ -927,6 +927,24 @@ xf86RandR12Init (ScreenPtr pScreen)
return TRUE;
}
void
xf86RandR12CloseScreen (ScreenPtr pScreen)
{
XF86RandRInfoPtr randrp;
#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(7,0,0,0,0)
if (xf86RandR12Key == NULL)
return;
#endif
randrp = XF86RANDRINFO(pScreen);
#if RANDR_12_INTERFACE
xf86Screens[pScreen->myNum]->EnterVT = randrp->orig_EnterVT;
#endif
free(randrp);
}
void
xf86RandR12SetRotations (ScreenPtr pScreen, Rotation rotations)
{
......@@ -1755,10 +1773,16 @@ static Bool
xf86RandR12EnterVT (int screen_index, int flags)
{
ScreenPtr pScreen = screenInfo.screens[screen_index];
ScrnInfoPtr pScrn = xf86Screens[screen_index];
XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen);
Bool ret;
if (randrp->orig_EnterVT) {
if (!randrp->orig_EnterVT (screen_index, flags))
pScrn->EnterVT = randrp->orig_EnterVT;
ret = pScrn->EnterVT (screen_index, flags);
randrp->orig_EnterVT = pScrn->EnterVT;
pScrn->EnterVT = xf86RandR12EnterVT;
if (!ret)
return FALSE;
}
......
......@@ -30,6 +30,7 @@
extern _X_EXPORT Bool xf86RandR12CreateScreenResources (ScreenPtr pScreen);
extern _X_EXPORT Bool xf86RandR12Init(ScreenPtr pScreen);
extern _X_EXPORT void xf86RandR12CloseScreen(ScreenPtr pScreen);
extern _X_EXPORT void xf86RandR12SetRotations (ScreenPtr pScreen, Rotation rotation);
extern _X_EXPORT void xf86RandR12SetTransformSupport (ScreenPtr pScreen, Bool transforms);
extern _X_EXPORT Bool xf86RandR12SetConfig(ScreenPtr pScreen, Rotation rotation, int rate,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment