Date: Tue, 18 Jun 2013 11:25:38 -0700 From: Jeremy Chadwick <jdc@koitsu.org> To: Javad Kouhi <javad.kouhi@gmail.com> Cc: Michiel Boland <boland37@xs4all.nl>, freebsd-stable@freebsd.org Subject: Re: system sporadically hangs on shutdown after switching to WITH_NEW_XORG Message-ID: <20130618182538.GA3380@icarus.home.lan> In-Reply-To: <CA%2Bg814fXiGZh%2Bh89DVdY_Rv_r9O3joTKDiwaZi5CK1qjJ556rg@mail.gmail.com> References: <51BDD593.5000102@xs4all.nl> <51BF60A8.6000503@xs4all.nl> <20130617193726.GR91021@kib.kiev.ua> <CA%2Bg814fgxmkCjVNrqoTiE0AEQwGr5gystCUiMzDLCtZ3aTtk%2BQ@mail.gmail.com> <51C06AD2.5030404@xs4all.nl> <CA%2Bg814dFmC1j4Czitn-VN9z3S29qBaMW47dOBOvbsaAxPvnWpg@mail.gmail.com> <20130618144722.GA3446@icarus.home.lan> <CA%2Bg814fXiGZh%2Bh89DVdY_Rv_r9O3joTKDiwaZi5CK1qjJ556rg@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, Jun 18, 2013 at 10:37:10PM +0430, Javad Kouhi wrote: > On Tue, Jun 18, 2013 at 7:17 PM, Jeremy Chadwick <jdc@koitsu.org> wrote: > > > > I do not use git, I use svn, So I cannot help you with git "crap". > > > > Please revert your sys/dev/drm2/i915/intel_fb.c and > > sys/dev/syscons/scvgarndr.c back to r251934 (or newer) before following > > what I tell you below. > > > > The problem is either that: > > > > - The patch you were given is probably for a different FreeBSD release, > > thus the code/line numbers/info in the code break the fuzzy logic > > matching, > > - You copy-pasted the diff and because of tabs vs. spaces botched it, > > - git apply/patch/whatever is weird, > > - Multitudes of other possibilities I do not care to go into. > > > > The hack kib@ gave you is not hard to manually add yourself. It's very > > few lines of code. I'm very surprised you didn't try to manually add it > > yourself. So I have done that for you. First, the proof -- this is > > against r251939, by the way, but that shouldn't matter as nobody has > > touched this between r251934 and r251939: > > > > $ svn info > > Path: . > > Working Copy Root Path: /home/jdc/work/src > > URL: svn://svn.freebsd.org/base/stable/9 > > Repository Root: svn://svn.freebsd.org/base > > Repository UUID: ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f > > Revision: 251939 > > Node Kind: directory > > Schedule: normal > > Last Changed Author: marius > > Last Changed Rev: 251939 > > Last Changed Date: 2013-06-18 07:20:14 -0700 (Tue, 18 Jun 2013) > > > > $ svn status > > M sys/dev/drm2/i915/intel_fb.c > > M sys/dev/syscons/scvgarndr.c > > > > The diff itself is available here: > > > > http://jdc.koitsu.org/freebsd/sysmouse_vsync.diff > > > > I've also attached it here in Email (assuming the mailing list doesn't > > delete it). > > > > You should apply the patch using: > > > > cd /usr/src (or wherever your source is) > > patch -p0 < sysmouse_vsync.diff > > > > Assuming use of svn, you can revert this patch by doing: > > > > cd /usr/src (or wherever your source is) > > svn revert sys/dev/drm2/i915/intel_fb.c > > svn revert sys/dev/syscons/scvgarndr.c > > rm sys/dev/drm2/i915/intel_fb.c.orig > > rm sys/dev/syscons/scvgarndr.c.orig > > > > There is probably some other "magical" way to do all of this, but as > > anyone here knows, I do things manually because in general I do not > > trust VCSes or the "magic" they do under the hood; I prefer to do things > > that I know work. > > > > Good luck -- I cannot help with any other aspect to the issue. > > > > -- > > | Jeremy Chadwick jdc@koitsu.org | > > | UNIX Systems Administrator http://jdc.koitsu.org/ | > > | Making life hard for others since 1977. PGP 4BD6C0CB | > > > > Many thanks for the detailed answer. I've applied your patch and then > rebuilt the world and kernel. To be honest, I tried to apply the patch > manually but the syntax was too complex for me. Thanks for the help to > apply the patch. > > Unfortunately, the original issue is still exist and shutdown(8) > doesn't work properly. I'm a newbie and I don't know what informations > I should provide, but here is some basic information: > > % uname -a > FreeBSD minootux 9.1-STABLE FreeBSD 9.1-STABLE #0 r251946M: Tue Jun 18 > 21:16:56 IRDT 2013 root@minootux:/usr/obj/usr/src/sys/GIGABYTE > amd64 > > % pkg_info -I -x xorg-server -x drm > libdrm-2.4.44 Userspace interface to kernel Direct Rendering Module servi > xorg-server-1.12.4,1 X.Org X server and related programs > > The machine is a laptop and the following link contains the details > about the hardware: > http://www.gigabyte.com/products/product-page.aspx?pid=3793#sp > > KMS and NEW_XORG are enabled in my /etc/make.conf. First, what makes you think your issue is the same issue as reported by Michiel Boland? Let me point you to two of his posts (read them slowly and in full please): http://lists.freebsd.org/pipermail/freebsd-stable/2013-June/073821.html http://lists.freebsd.org/pipermail/freebsd-stable/2013-June/073839.html Second, the patch is not mine -- it's Konstantin's. I did not write the code/fix, nor do I understand it. All I did was provide a version of the same patch that applied cleanly on recent stable/9. (I'm sorry for needing to state this, but clear ownership of code/issues is important.) TL;DR -- The patch kib@ wrote was not for you, it was for Michiel. If the patch works for Michiel and fixes his issue, great. It sounds clearly, to me, like you have a different problem or an issue that manifests itself in the same manner but the root cause is different. Your issue should be handled separately (preferably in another thread). -- | Jeremy Chadwick jdc@koitsu.org | | UNIX Systems Administrator http://jdc.koitsu.org/ | | Making life hard for others since 1977. PGP 4BD6C0CB |
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130618182538.GA3380>