diff options
| author | marha <marha@users.sourceforge.net> | 2012-09-05 15:55:59 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-09-05 15:55:59 +0200 |
| commit | 046f1422921cf63104f394a430634d364a8fd35a (patch) | |
| tree | 5d49eef25d6c128ea369383e8de2a0e5a5dcf1c3 /xorg-server/hw/xfree86 | |
| parent | f2c10b20ce3f657c1f2013057602bb439816940f (diff) | |
| parent | 50fad5cd2be4cd105c99687e224da60233f81645 (diff) | |
| download | vcxsrv-046f1422921cf63104f394a430634d364a8fd35a.tar.gz vcxsrv-046f1422921cf63104f394a430634d364a8fd35a.tar.bz2 vcxsrv-046f1422921cf63104f394a430634d364a8fd35a.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/dix/dispatch.c
Diffstat (limited to 'xorg-server/hw/xfree86')
| -rw-r--r-- | xorg-server/hw/xfree86/common/xf86Events.c | 11 | ||||
| -rw-r--r-- | xorg-server/hw/xfree86/modes/xf86Crtc.c | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86Events.c b/xorg-server/hw/xfree86/common/xf86Events.c index 47429ecfe..3ad34b543 100644 --- a/xorg-server/hw/xfree86/common/xf86Events.c +++ b/xorg-server/hw/xfree86/common/xf86Events.c @@ -460,6 +460,8 @@ xf86VTSwitch(void) OsBlockSIGIO(); for (i = 0; i < xf86NumScreens; i++) xf86Screens[i]->LeaveVT(xf86Screens[i]); + for (i = 0; i < xf86NumGPUScreens; i++) + xf86GPUScreens[i]->LeaveVT(xf86GPUScreens[i]); xf86AccessLeave(); /* We need this here, otherwise */ @@ -474,6 +476,10 @@ xf86VTSwitch(void) if (!xf86Screens[i]->EnterVT(xf86Screens[i])) FatalError("EnterVT failed for screen %d\n", i); } + for (i = 0; i < xf86NumGPUScreens; i++) { + if (!xf86GPUScreens[i]->EnterVT(xf86GPUScreens[i])) + FatalError("EnterVT failed for gpu screen %d\n", i); + } if (!(dispatchException & DE_TERMINATE)) { for (i = 0; i < xf86NumScreens; i++) { if (xf86Screens[i]->EnableDisableFBAccess) @@ -530,6 +536,11 @@ xf86VTSwitch(void) if (!xf86Screens[i]->EnterVT(xf86Screens[i])) FatalError("EnterVT failed for screen %d\n", i); } + for (i = 0; i < xf86NumGPUScreens; i++) { + xf86GPUScreens[i]->vtSema = TRUE; + if (!xf86GPUScreens[i]->EnterVT(xf86GPUScreens[i])) + FatalError("EnterVT failed for gpu screen %d\n", i); + } for (i = 0; i < xf86NumScreens; i++) { if (xf86Screens[i]->EnableDisableFBAccess) (*xf86Screens[i]->EnableDisableFBAccess) (xf86Screens[i], TRUE); diff --git a/xorg-server/hw/xfree86/modes/xf86Crtc.c b/xorg-server/hw/xfree86/modes/xf86Crtc.c index 1947c5be9..e3eaf5f4c 100644 --- a/xorg-server/hw/xfree86/modes/xf86Crtc.c +++ b/xorg-server/hw/xfree86/modes/xf86Crtc.c @@ -728,8 +728,6 @@ xf86CrtcCloseScreen(ScreenPtr screen) xf86RandR12CloseScreen(screen); - free(config->name); - screen->CloseScreen(screen); for (o = 0; o < config->num_output; o++) { |