From owner-freebsd-stable@FreeBSD.ORG Wed Jan 7 01:17:28 2009 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1D1A7106566B for ; Wed, 7 Jan 2009 01:17:28 +0000 (UTC) (envelope-from torfinn.ingolfsen@broadpark.no) Received: from osl1smout1.broadpark.no (osl1smout1.broadpark.no [80.202.4.58]) by mx1.freebsd.org (Postfix) with ESMTP id CC20D8FC0C for ; Wed, 7 Jan 2009 01:17:27 +0000 (UTC) (envelope-from torfinn.ingolfsen@broadpark.no) MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: text/plain; charset=US-ASCII Received: from osl1sminn1.broadpark.no ([80.202.4.59]) by osl1smout1.broadpark.no (Sun Java(tm) System Messaging Server 6.3-3.01 (built Jul 12 2007; 32bit)) with ESMTP id <0KD200B3JU92GNC0@osl1smout1.broadpark.no> for freebsd-stable@freebsd.org; Wed, 07 Jan 2009 02:17:26 +0100 (CET) Received: from kg-work2.kg4.no ([80.203.109.110]) by osl1sminn1.broadpark.no (Sun Java(tm) System Messaging Server 6.3-3.01 (built Jul 12 2007; 32bit)) with SMTP id <0KD200452U91YP70@osl1sminn1.broadpark.no> for freebsd-stable@freebsd.org; Wed, 07 Jan 2009 02:17:26 +0100 (CET) Date: Wed, 07 Jan 2009 02:17:25 +0100 From: Torfinn Ingolfsen To: freebsd-stable@freebsd.org Message-id: <20090107021725.3d43a49f.torfinn.ingolfsen@broadpark.no> In-reply-to: <20090107012457.f9ce6dba.torfinn.ingolfsen@broadpark.no> References: <1231263380.57454.23.camel@squirrel.corp.cox.com> <20090107012457.f9ce6dba.torfinn.ingolfsen@broadpark.no> X-Mailer: Sylpheed 2.5.0 (GTK+ 2.12.11; i386-portbld-freebsd7.0) X-Face: "t9w2,-X@O^I`jVW\sonI3.,36KBLZE*AL[y9lL[PyFD*r_S:dIL9c[8Y>V42R0"!"yb_zN,f#%.[PYYNq; m"_0v; ~rUM2Yy!zmkh)3&U|u!=T(zyv,MHJv"nDH>OJ`t(@mil461d_B'Uo|'nMwlKe0Mv=kvV?Nh@>Hb<3s_z2jYgZhPb@?Wi^x1a~Hplz1.zH Subject: Re: Pending MFC of drm updates X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Jan 2009 01:17:28 -0000 On Wed, 07 Jan 2009 01:24:57 +0100 Torfinn Ingolfsen wrote: I forgot to tell that I fixed the Makefile in sys/modules/drm/i915 manually. > Apparently patch gets confuseed when it finds a file with the same > name in the current directory (which was /usr/src), or perhaps I > don't know how to tell patch how to find the right file. > I just did: > cd /usr/src > patch < /dir/name/patchfile > > Anyway, a 'make kernel' fails: Which is no wonder, because patch misplaced more files: root@kg-v2# pwd /usr/src root@kg-v2# ll *.c *c.orig *.h *h.orig -rw-r--r-- 1 root wheel 1650 Jan 7 01:09 drm_internal.h -rw-r--r-- 1 root wheel 0 Jan 7 01:09 drm_internal.h.orig -rw-r--r-- 1 root wheel 16455 Jan 7 01:09 i915_suspend.c -rw-r--r-- 1 root wheel 0 Jan 7 01:09 i915_suspend.c.orig -rw-r--r-- 1 root wheel 59118 Jan 7 01:09 radeon_microcode.h -rw-r--r-- 1 root wheel 0 Jan 7 01:09 radeon_microcode.h.orig Is ther a "secret handshake" to make patch put the files in their correct place? (Except for reading through the whole patchfile to determine if all touched filews are in the same directory.) For now I just mv'ed the files into place. Anyway, now the new kernel builds, installs and works correctly. It didn't pick up any drm, but I'm not sure that it should either. This machine[1] has a GeForce 8200 chipset. More info about FreeBSD on this machine here[2], including dmesgs before and after, etc. HTH References: 1) http://tingox.googlepages.com/asus_v2-m3n8200 2) http://tingox.googlepages.com/asus_v2-m3n8200_freebsd -- Regards, Torfinn Ingolfsen