diff options
| author | Giovanni Campagna <scampa.giovanni@gmail.com> | 2013-08-21 10:02:43 +0200 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2013-09-11 10:37:21 -0700 |
| commit | d9fb46c2caedf135c21c983a8e379e9bdfc5043d (patch) | |
| tree | ed3f977f000b23e322966db6082e7858cb642616 | |
| parent | d9769c193765ac303ad4d4760e57ff368df1f663 (diff) | |
| download | xorg-driver-xf86-video-intel-xwayland.tar.gz | |
xwayland: shortcut Enter/ExitVTxwayland
Avoids a warning due to drmGetMaster and a crash with multimonitor,
caused by not having an intel_mode.
| -rw-r--r-- | src/uxa/intel_driver.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/uxa/intel_driver.c b/src/uxa/intel_driver.c index e74ba600..1c380756 100644 --- a/src/uxa/intel_driver.c +++ b/src/uxa/intel_driver.c @@ -1175,6 +1175,9 @@ static void I830LeaveVT(VT_FUNC_ARGS_DECL) intel_screen_private *intel = intel_get_screen_private(scrn); int ret; + if (xorgWayland) + return TRUE; + xf86RotateFreeShadow(scrn); xf86_hide_cursors(scrn); @@ -1194,6 +1197,9 @@ static Bool I830EnterVT(VT_FUNC_ARGS_DECL) intel_screen_private *intel = intel_get_screen_private(scrn); int ret; + if (xorgWayland) + return TRUE; + ret = drmSetMaster(intel->drmSubFD); if (ret) { xf86DrvMsg(scrn->scrnIndex, X_WARNING, |