xf86-video-modesetting: 2 commits - src/driver.c
Dave Airlie
airlied at kemper.freedesktop.org
Tue Apr 17 03:54:25 PDT 2012
src/driver.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
New commits:
commit 296d08ef590063fcc6f268778bc012df2d0243c4
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Apr 17 11:50:40 2012 +0100
modesetting: add set/drop master around VT switch
diff --git a/src/driver.c b/src/driver.c
index 516bf61..827438a 100644
--- a/src/driver.c
+++ b/src/driver.c
@@ -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);
commit d0db3b74acad13106cac19199da115b78a29207b
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Apr 17 11:48:03 2012 +0100
cursor: hide cursors on LeaveVT
diff --git a/src/driver.c b/src/driver.c
index b776ca1..516bf61 100644
--- a/src/driver.c
+++ b/src/driver.c
@@ -757,6 +757,8 @@ LeaveVT(int scrnIndex, int flags)
{
ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+ xf86_hide_cursors(pScrn);
+
pScrn->vtSema = FALSE;
}
More information about the xorg-commit
mailing list