On Fri, Jan 31, 2014 at 9:19 PM, Laércio de Sousa <lbsous...@gmail.com> wrote: > This fixes a bug that prevents X.Org from starting properly on, > e.g., NVIDIA cards with proprietary drivers, when "-seat" option > is passed with an argument different from "seat0". > > Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=66851
Reviewed-by: Dave Airlie <airl...@redhat.com> though I'll be on the lookout for any fallout from this. Dave. > > Signed-off-by: Laércio de Sousa <lbsous...@gmail.com> > --- > hw/xfree86/common/xf86Bus.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c > index 329d0b3..23dfa37 100644 > --- a/hw/xfree86/common/xf86Bus.c > +++ b/hw/xfree86/common/xf86Bus.c > @@ -81,7 +81,7 @@ xf86CallDriverProbe(DriverPtr drv, Bool detect_only) > if (drv->platformProbe != NULL) { > foundScreen = xf86platformProbeDev(drv); > } > - if (ServerIsNotSeat0()) > + if (ServerIsNotSeat0() && foundScreen) > return foundScreen; > #endif > > @@ -201,7 +201,7 @@ xf86BusProbe(void) > { > #ifdef XSERVER_PLATFORM_BUS > xf86platformProbe(); > - if (ServerIsNotSeat0()) > + if (ServerIsNotSeat0() && xf86_num_platform_devices > 0) > return; > #endif > #ifdef XSERVER_LIBPCIACCESS > -- > 1.8.1.4 > > _______________________________________________ > xorg-devel@lists.x.org: X.Org development > Archives: http://lists.x.org/archives/xorg-devel > Info: http://lists.x.org/mailman/listinfo/xorg-devel _______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel