From patchwork Fri Jul 11 08:43:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 4531811 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3DD819F4F5 for ; Fri, 11 Jul 2014 08:43:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 57494201F4 for ; Fri, 11 Jul 2014 08:43:19 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 5CA87201D5 for ; Fri, 11 Jul 2014 08:43:18 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DCB566E105; Fri, 11 Jul 2014 01:43:17 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org 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) Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s6B8hCZH021197 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 11 Jul 2014 04:43:12 -0400 Received: from shalem.localdomain (vpn1-6-44.ams2.redhat.com [10.36.6.44]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s6B8hAJJ013515 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Fri, 11 Jul 2014 04:43:11 -0400 Message-ID: <53BFA39D.5070708@redhat.com> Date: Fri, 11 Jul 2014 10:43:09 +0200 From: Hans de Goede User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.6.0 MIME-Version: 1.0 To: Chris Wilson , Felix Miata , intel-gfx@lists.freedesktop.org References: <53BF394B.10503@earthlink.net> <20140711062204.GS8986@nuc-i3427.alporthouse.com> In-Reply-To: <20140711062204.GS8986@nuc-i3427.alporthouse.com> X-Enigmail-Version: 1.6 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 Subject: Re: [Intel-gfx] startx on Fedora died today X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 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