From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hans de Goede Subject: Re: startx on Fedora died today Date: Fri, 11 Jul 2014 10:43:09 +0200 Message-ID: <53BFA39D.5070708@redhat.com> References: <53BF394B.10503@earthlink.net> <20140711062204.GS8986@nuc-i3427.alporthouse.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------090100000306030302070706" Return-path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by gabe.freedesktop.org (Postfix) with ESMTP id 6FBB36E200 for ; Fri, 11 Jul 2014 01:43:16 -0700 (PDT) In-Reply-To: <20140711062204.GS8986@nuc-i3427.alporthouse.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Chris Wilson , Felix Miata , intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org This is a multi-part message in MIME format. --------------090100000306030302070706 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Hi, On 07/11/2014 08:22 AM, Chris Wilson wrote: > On Thu, Jul 10, 2014 at 09:09:31PM -0400, Felix Miata wrote: >> F21 branched off Rawhide over recent hours. On i945G host gx62b I >> cloned first, then upgraded one to current F21 state and the other >> to Rawhide. Before today's upgrade, which moved server from >> 1.15.99.903 to 1.15.99.904 on both, and kernel from rc4git0.1 to >> rc4git2.1, booting first to multi-user, startx was working normally. >> Now it won't[1], though X (KDM/KDE) does work by booting to >> graphical instead of multi-user[2]. >> >> Is this an already known driver problem? Server? Kernel? > > The difference being when it crashed it tried to open the logind fd. This > is a server bug - it looks like the recent non-pci platform device > conflicts with the systemd integration. Yes, pretty literary conflicts, they re-used an existing ODEV_ATTRIB id for a new one they used (probably an innocent rebase error). I've just send a fix to the xorg-devel list for this, and I'm starting a new Fedora rawhide / F-21 server build with this fix included. I've attached the fix here for reference. Regards, Hans --------------090100000306030302070706 Content-Type: text/x-patch; name="0001-Fix-ODEV_ATTRIB_DRIVER-overlapping-with-ODEV_ATTRIB_.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0001-Fix-ODEV_ATTRIB_DRIVER-overlapping-with-ODEV_ATTRIB_.pa"; filename*1="tch" >>From 1f822291a3db6b5f6bd5f60ba240f2ee0cbdf683 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 11 Jul 2014 09:49:13 +0200 Subject: [PATCH] Fix ODEV_ATTRIB_DRIVER overlapping with ODEV_ATTRIB_FD Looks like the value of ODEV_ATTRIB_DRIVER was not updated when the patch adding it got rebased on top of a newer server version. This fixes the xserver crashing when systemd-logind integration is used. https://bugzilla.redhat.com/show_bug.cgi?id=1118540 Signed-off-by: Hans de Goede --- include/hotplug.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/hotplug.h b/include/hotplug.h index c4268a0..b2c0d78 100644 --- a/include/hotplug.h +++ b/include/hotplug.h @@ -88,7 +88,7 @@ config_odev_free_attributes(struct OdevAttributes *attribs); /* Minor number of the device node pointed to by ODEV_ATTRIB_PATH */ #define ODEV_ATTRIB_MINOR 6 /* kernel driver name */ -#define ODEV_ATTRIB_DRIVER 4 +#define ODEV_ATTRIB_DRIVER 7 typedef void (*config_odev_probe_proc_ptr)(struct OdevAttributes *attribs); void config_odev_probe(config_odev_probe_proc_ptr probe_callback); -- 2.0.0 --------------090100000306030302070706 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx --------------090100000306030302070706--