From owner-freebsd-current@FreeBSD.ORG Sun May 6 00:03:55 2012 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9EC1D1065672 for ; Sun, 6 May 2012 00:03:55 +0000 (UTC) (envelope-from erichfreebsdlist@ovitrap.com) Received: from alogreentechnologies.com (alogreentechnologies.com [67.212.226.44]) by mx1.freebsd.org (Postfix) with ESMTP id 5CC1F8FC0A for ; Sun, 6 May 2012 00:03:55 +0000 (UTC) Received: from amd620.ovitrap.com ([49.128.188.2]) (authenticated bits=0) by alogreentechnologies.com (8.13.1/8.13.1) with ESMTP id q4603lrJ020743; Sat, 5 May 2012 18:03:53 -0600 From: Erich Dollansky To: freebsd-current@freebsd.org Date: Sun, 6 May 2012 07:03:42 +0700 User-Agent: KMail/1.13.7 (FreeBSD/8.3-STABLE; KDE/4.7.4; amd64; ; ) References: <201205041029.24565.erichfreebsdlist@ovitrap.com> <4FA44CE2.3070005@gmail.com> In-Reply-To: <4FA44CE2.3070005@gmail.com> MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <201205060703.42274.erichfreebsdlist@ovitrap.com> Cc: matt , Artem Tuchinsky Subject: Re: X220 and all.14.5.patch X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 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: Sun, 06 May 2012 00:03:55 -0000 Hi, On Saturday 05 May 2012 04:40:50 matt wrote: > On 05/03/12 22:12, Artem Tuchinsky wrote: > > > > > Is it possibly that the patch got applied twice? I had some errors a not at my side. > while back that were resulting from an inconsistent mixture of > pre-patch, post-patch and double patched files...I deleted /usr/src and > followed the patching instructions after doing a fresh csup. There is > also (or was) some sed command that fixes some issues in the files that > must not be skipped due to cvs tags. Don't forget to rm /usr/obj. this one? sed -i -e 's/FreeBSD: src.*Exp /FreeBSD/' /usr/src/sys/dev/drm/i915_suspend.c I downloaded a new source tree into an empty directory, applied the patch and get this now: drm_drv.o:(.data+0x100): undefined reference to `drm_gem_close_ioctl' drm_drv.o:(.data+0x118): undefined reference to `drm_gem_flink_ioctl' drm_drv.o:(.data+0x130): undefined reference to `drm_gem_open_ioctl' drm_drv.o:(.data+0x2f8): undefined reference to `drm_setmaster_ioctl' drm_drv.o:(.data+0x310): undefined reference to `drm_dropmaster_ioctl' drm_drv.o:(.data+0xf28): undefined reference to `drm_mode_getresources' drm_drv.o:(.data+0xf40): undefined reference to `drm_mode_getcrtc' drm_drv.o:(.data+0xf58): undefined reference to `drm_mode_setcrtc' drm_drv.o:(.data+0xf70): undefined reference to `drm_mode_cursor_ioctl' drm_drv.o:(.data+0xf88): undefined reference to `drm_mode_gamma_get_ioctl' drm_drv.o:(.data+0xfa0): undefined reference to `drm_mode_gamma_set_ioctl' drm_drv.o:(.data+0xfb8): undefined reference to `drm_mode_getencoder' drm_drv.o:(.data+0xfd0): undefined reference to `drm_mode_getconnector' drm_drv.o:(.data+0xfe8): undefined reference to `drm_mode_attachmode_ioctl' drm_drv.o:(.data+0x1000): undefined reference to `drm_mode_detachmode_ioctl' drm_drv.o:(.data+0x1018): undefined reference to `drm_mode_getproperty_ioctl' drm_drv.o:(.data+0x1030): undefined reference to `drm_mode_connector_property_set_ioctl' drm_drv.o:(.data+0x1048): undefined reference to `drm_mode_getblob_ioctl' drm_drv.o:(.data+0x1060): undefined reference to `drm_mode_getfb' drm_drv.o:(.data+0x1078): undefined reference to `drm_mode_addfb' drm_drv.o:(.data+0x1090): undefined reference to `drm_mode_rmfb' drm_drv.o:(.data+0x10a8): undefined reference to `drm_mode_page_flip_ioctl' drm_drv.o:(.data+0x10c0): undefined reference to `drm_mode_dirtyfb_ioctl' drm_drv.o:(.data+0x10d8): undefined reference to `drm_mode_create_dumb_ioctl' drm_drv.o:(.data+0x10f0): undefined reference to `drm_mode_mmap_dumb_ioctl' drm_drv.o:(.data+0x1108): undefined reference to `drm_mode_destroy_dumb_ioctl' drm_drv.o:(.data+0x1120): undefined reference to `drm_mode_getplane_res' drm_drv.o:(.data+0x1138): undefined reference to `drm_mode_getplane' drm_drv.o:(.data+0x1150): undefined reference to `drm_mode_setplane' drm_drv.o:(.data+0x1168): undefined reference to `drm_mode_addfb2' drm_drv.o:(.data+0x1890): undefined reference to `drm_gem_mmap_single' and many more errors like this. I also did this I get a reject in i915_mem.c. Remove this file, also remove i915_mem.c.rej, i915_mem.c.orig. as stated in the Wiki but then make complains about not finding i915_mem.c. After a touch i915_mem.c, it compiles but does not link. I will investigate further now. Erich