From owner-freebsd-current@FreeBSD.ORG Thu Dec 13 23:30:59 2012 Return-Path: Delivered-To: freebsd-current@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5138E410; Thu, 13 Dec 2012 23:30:59 +0000 (UTC) (envelope-from zeising@freebsd.org) Received: from mail.lysator.liu.se (mail.lysator.liu.se [IPv6:2001:6b0:17:f0a0::3]) by mx1.freebsd.org (Postfix) with ESMTP id A0C5F8FC12; Thu, 13 Dec 2012 23:30:58 +0000 (UTC) Received: from mail.lysator.liu.se (localhost [127.0.0.1]) by mail.lysator.liu.se (Postfix) with ESMTP id EBC0440009; Fri, 14 Dec 2012 00:30:57 +0100 (CET) Received: by mail.lysator.liu.se (Postfix, from userid 1004) id E0AA34000A; Fri, 14 Dec 2012 00:30:57 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on bernadotte.lysator.liu.se X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=AWL autolearn=disabled version=3.3.1 X-Spam-Score: 0.0 Received: from mx.daemonic.se (mx.daemonic.se [IPv6:2001:470:dca9:0:1::3]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.lysator.liu.se (Postfix) with ESMTPSA id A5AD540009; Fri, 14 Dec 2012 00:30:56 +0100 (CET) Received: from mailscanner.daemonic.se (mailscanner.daemonic.se [IPv6:2001:470:dca9:0:1::6]) by mx.daemonic.se (Postfix) with ESMTPS id 3YMrjp4lcQz8hVn; Fri, 14 Dec 2012 00:30:54 +0100 (CET) X-Virus-Scanned: amavisd-new at daemonic.se Received: from mx.daemonic.se ([IPv6:2001:470:dca9:0:1::3]) (using TLS with cipher CAMELLIA256-SHA) by mailscanner.daemonic.se (mailscanner.daemonic.se [IPv6:2001:470:dca9:0:1::6]) (amavisd-new, port 10025) with ESMTPS id yDNCrqvDdxOY; Fri, 14 Dec 2012 00:30:52 +0100 (CET) Received: from mail.daemonic.se (mail.daemonic.se [IPv6:2001:470:dca9:0:1::4]) by mx.daemonic.se (Postfix) with ESMTPS id 3YMrjm2lP8z8hVm; Fri, 14 Dec 2012 00:30:52 +0100 (CET) Received: from vivi.daemonic.se (vivi.daemonic.se [10.32.0.4]) by mail.daemonic.se (Postfix) with ESMTPSA id 3YMrjm24wBz9Ctj; Fri, 14 Dec 2012 00:30:52 +0100 (CET) Message-ID: <50CA652C.5010101@freebsd.org> Date: Fri, 14 Dec 2012 00:30:52 +0100 From: Niclas Zeising User-Agent: Mutt/1.5.21 MIME-Version: 1.0 To: Johannes Dieterich Subject: Re: new xorg segfault 11 with KMS References: <50CA4A58.7070109@FreeBSD.org> <50CA4D3D.3040401@gmail.com> <07938D0C-15C4-430F-9E1F-828DB01CDFB7@FreeBSD.org> <50CA50C6.2080501@gmail.com> In-Reply-To: <50CA50C6.2080501@gmail.com> X-Enigmail-Version: 1.4.6 Content-Type: multipart/mixed; boundary="------------050607000409020003060108" X-Virus-Scanned: ClamAV using ClamSMTP Cc: Dimitry Andric , freebsd-current@FreeBSD.org, David Chisnall X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Dec 2012 23:30:59 -0000 This is a multi-part message in MIME format. --------------050607000409020003060108 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Can you please try the attached patch, against x11-servers/xorg-server. Apply it and recompile xorg-server with normal flags (that is, no debugging) and let me and the list know the result when starting X. Regards! -- Niclas Zeising --------------050607000409020003060108 Content-Type: text/x-patch; name="xorg-server.clangfix.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="xorg-server.clangfix.diff" Index: x11-servers/xorg-server/Makefile =================================================================== --- x11-servers/xorg-server/Makefile (revision 308805) +++ x11-servers/xorg-server/Makefile (working copy) @@ -29,7 +29,8 @@ XORG_REVISION= 1 PLIST_SUB+= OLD="@comment " NEW="" EXTRA_PATCHES+= ${FILESDIR}/extra-hw_dmx_glxProxy_compsize.h \ - ${FILESDIR}/extra-hw_dmx_glxProxy_glxcmds.h + ${FILESDIR}/extra-hw_dmx_glxProxy_glxcmds.h \ + ${FILESDIR}/extra-clang .else XORG_VERSION= 1.7.7 XORG_REVISION= 6 Index: x11-servers/xorg-server/files/extra-clang =================================================================== --- x11-servers/xorg-server/files/extra-clang (revision 0) +++ x11-servers/xorg-server/files/extra-clang (working copy) @@ -0,0 +1,53 @@ +--- hw/xfree86/common/xf86Xinput.c.orig 2012-12-13 23:58:55.673738569 +0100 ++++ hw/xfree86/common/xf86Xinput.c 2012-12-13 23:59:52.528738525 +0100 +@@ -479,7 +479,7 @@ + MatchAttrToken(const char *attr, struct list *patterns, + int (*compare)(const char *attr, const char *pattern)) + { +- const xf86MatchGroup *group; ++ const xf86MatchGroup *group = NULL; + + /* If there are no patterns, accept the match */ + if (list_is_empty(patterns)) +--- hw/xfree86/parser/InputClass.c.orig 2012-12-14 00:03:07.149734651 +0100 ++++ hw/xfree86/parser/InputClass.c 2012-12-14 00:04:09.522735172 +0100 +@@ -338,7 +338,8 @@ + XF86ConfInputClassPtr prev; + + while (ptr) { +- xf86MatchGroup *group, *next; ++ xf86MatchGroup *group = NULL; ++ xf86MatchGroup *next; + char **list; + + TestFree(ptr->identifier); +--- hw/xfree86/dri2/dri2.c.orig 2012-12-14 00:06:39.680738243 +0100 ++++ hw/xfree86/dri2/dri2.c 2012-12-14 00:08:14.310729622 +0100 +@@ -201,7 +201,7 @@ + static DRI2DrawableRefPtr + DRI2LookupDrawableRef(DRI2DrawablePtr pPriv, XID id) + { +- DRI2DrawableRefPtr ref; ++ DRI2DrawableRefPtr ref = NULL; + + list_for_each_entry(ref, &pPriv->reference_list, link) { + if (ref->id == id) +@@ -267,7 +267,8 @@ + { + DRI2DrawablePtr pPriv = p; + DRI2ScreenPtr ds = pPriv->dri2_screen; +- DRI2DrawableRefPtr ref, next; ++ DRI2DrawableRefPtr ref = NULL; ++ DRI2DrawableRefPtr next; + WindowPtr pWin; + PixmapPtr pPixmap; + DrawablePtr pDraw; +@@ -534,7 +535,7 @@ + DRI2InvalidateDrawable(DrawablePtr pDraw) + { + DRI2DrawablePtr pPriv = DRI2GetDrawable(pDraw); +- DRI2DrawableRefPtr ref; ++ DRI2DrawableRefPtr ref = NULL; + + if (!pPriv) + return; --------------050607000409020003060108--