XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-04-14 17:18:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

modesetting: add set/drop master around VT switch

Browse Source
This commit is contained in:
Dave Airlie
2012-04-17 11:50:40 +01:00
parent 001dec8980
commit 00c663a3bc
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
hw/xfree86/drivers/modesetting/driver.c
View File

@@ -756,10 +756,12 @@ static void
LeaveVT(int scrnIndex, int flags)
{
ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
modesettingPtr ms = modesettingPTR(pScrn);
xf86_hide_cursors(pScrn);
pScrn->vtSema = FALSE;
drmDropMaster(ms->fd);
}
/*
@@ -773,6 +775,11 @@ EnterVT(int scrnIndex, int flags)
pScrn->vtSema = TRUE;
if (drmSetMaster(ms->fd)) {
xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "drmSetMaster failed: %s\n",
strerror(errno));
}
if (!drmmode_set_desired_modes(pScrn, &ms->drmmode))
return FALSE;
@@ -815,8 +822,6 @@ CloseScreen(int scrnIndex, ScreenPtr pScreen)
pScreen->CreateScreenResources = ms->createScreenResources;
pScreen->BlockHandler = ms->BlockHandler;
drmDropMaster(ms->fd);
pScrn->vtSema = FALSE;
pScreen->CloseScreen = ms->CloseScreen;
return (*pScreen->CloseScreen) (scrnIndex, pScreen);