[PATCH xf86-video-intel] xwayland: shortcut Enter/ExitVT

Giovanni Campagna scampa.giovanni at gmail.com
Wed Aug 21 01:02:43 PDT 2013


Avoids a warning due to drmGetMaster and a crash with multimonitor,
caused by not having an intel_mode.
---
 src/intel_driver.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/intel_driver.c b/src/intel_driver.c
index d1da72d..b7702e6 100644
--- a/src/intel_driver.c
+++ b/src/intel_driver.c
@@ -1157,6 +1157,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);
@@ -1176,6 +1179,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,
-- 
1.8.3.1



More information about the wayland-devel mailing list