From owner-freebsd-current@FreeBSD.ORG Sun May 6 08:04:15 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 A2BBF1065673 for ; Sun, 6 May 2012 08:04:15 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from citadel.icyb.net.ua (citadel.icyb.net.ua [212.40.38.140]) by mx1.freebsd.org (Postfix) with ESMTP id E4BD88FC14 for ; Sun, 6 May 2012 08:04:14 +0000 (UTC) Received: from porto.starpoint.kiev.ua (porto-e.starpoint.kiev.ua [212.40.38.100]) by citadel.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id LAA24673; Sun, 06 May 2012 11:04:10 +0300 (EEST) (envelope-from avg@FreeBSD.org) Received: from localhost ([127.0.0.1]) by porto.starpoint.kiev.ua with esmtp (Exim 4.34 (FreeBSD)) id 1SQwRt-000DCp-Kr; Sun, 06 May 2012 11:04:09 +0300 Message-ID: <4FA63078.3020805@FreeBSD.org> Date: Sun, 06 May 2012 11:04:08 +0300 From: Andriy Gapon User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:12.0) Gecko/20120503 Thunderbird/12.0.1 MIME-Version: 1.0 To: Erich Dollansky References: <201205041029.24565.erichfreebsdlist@ovitrap.com> <4FA44CE2.3070005@gmail.com> <201205060703.42274.erichfreebsdlist@ovitrap.com> In-Reply-To: <201205060703.42274.erichfreebsdlist@ovitrap.com> X-Enigmail-Version: 1.5pre Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Cc: matt , Artem Tuchinsky , freebsd-current@FreeBSD.org 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 08:04:15 -0000 on 06/05/2012 03:03 Erich Dollansky said the following: > 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. Do you try to compile i915 driver into kernel? Do you not have "device drm" in kernel config? In any case I suggest that you use i915 as a module, but make sure that you compile the module as a part of kernel build (e.g. via MODULES_OVERRIDE unless you already build all the modules). -- Andriy Gapon