On Wed, Aug 21, 2013 at 10:02:43AM +0200, Giovanni Campagna wrote: > Avoids a warning due to drmGetMaster and a crash with multimonitor, > caused by not having an intel_mode.
I finally applied this patch. The one thing I wasn't sure about is the call to xf86SetDesiredModes() in I830EnterVT, but I don't think we need it after all. We're still missing something though, the xrandr output is missing a few bits: Screen 0: minimum 320 x 200, current 1024 x 600, maximum 8192 x 8192 XWAYLAND-1 connected (normal left inverted right x axis y axis) 1024x600 59.7 which, compared to the native Xorg output: Screen 0: minimum 320 x 200, current 4000 x 1600, maximum 8192 x 8192 eDP1 connected primary 1440x900+0+0 (normal left inverted right x axis y axis) 30mm x 179mm 1440x900 60.0*+ 1024x768 60.0 800x600 60.3 56.2 640x480 59.9 is missing the 'primary' flags and the '1440x900+0+0' part. But at least it comes up now. thanks, Kristian > --- > 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 > > _______________________________________________ > wayland-devel mailing list > wayland-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/wayland-devel _______________________________________________ wayland-devel mailing list wayland-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/wayland-devel