From owner-freebsd-x11@FreeBSD.ORG Sun Sep 28 00:20:14 2008 Return-Path: Delivered-To: freebsd-x11@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5702C106569E for ; Sun, 28 Sep 2008 00:20:14 +0000 (UTC) (envelope-from mailinglist@ahhyes.net) Received: from mail06.syd.optusnet.com.au (mail06.syd.optusnet.com.au [211.29.132.187]) by mx1.freebsd.org (Postfix) with ESMTP id EB7448FC16 for ; Sun, 28 Sep 2008 00:20:13 +0000 (UTC) (envelope-from mailinglist@ahhyes.net) Received: from laptop.xor.net (c122-106-7-184.rivrw1.nsw.optusnet.com.au [122.106.7.184]) by mail06.syd.optusnet.com.au (8.13.1/8.13.1) with ESMTP id m8S0KBFi012243 for ; Sun, 28 Sep 2008 10:20:12 +1000 Message-ID: <48DECDC0.20709@ahhyes.net> Date: Sun, 28 Sep 2008 10:20:16 +1000 From: Alex User-Agent: Thunderbird 2.0.0.16 (X11/20080902) MIME-Version: 1.0 To: freebsd-x11@freebsd.org References: <48DD9ECD.40309@ahhyes.net> <1222524191.1662.3.camel@wombat.2hip.net> In-Reply-To: <1222524191.1662.3.camel@wombat.2hip.net> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: DRI not working X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Sep 2008 00:20:14 -0000 Robert Noland wrote: > drm shouldn't be attaching to the second head. The 852/5 chips have the > same pci id on both heads, which none of the other chips do. Please try > the attached patch to sys/dev/drm/i915_drv.c and see if that improves > things. > > robert. > Hi Robert, Thank you for your reply, and patch, but it seems the patch will not apply cleanly. [root@laptop /usr/src/sys/dev/drm]# patch -p0 < i855-no-attach-sec.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: i915_drv.c |=================================================================== |--- i915_drv.c (revision 183406) |+++ i915_drv.c (working copy) -------------------------- Patching file i915_drv.c using Plan A... Hunk #1 failed at 85. 1 out of 1 hunks failed--saving rejects to i915_drv.c.rej done [root@laptop /usr/src/sys/dev/drm]# cat i915_drv.c.rej *************** *** 85,90 **** { drm_device_t *dev = device_get_softc(nbdev); bzero(dev, sizeof(drm_device_t)); i915_configure(dev); return drm_attach(nbdev, i915_pciidlist); --- 85,93 ---- { drm_device_t *dev = device_get_softc(nbdev); + if (device_get_unit(nbdev)) + return 0; + bzero(dev, sizeof(drm_device_t)); i915_configure(dev); return drm_attach(nbdev, i915_pciidlist); I added the 2 lines manually. So the function looks like this: static int i915_attach(device_t nbdev) { drm_device_t *dev = device_get_softc(nbdev); if (device_get_unit(nbdev)) return 0; bzero(dev, sizeof(drm_device_t)); i915_configure(dev); return drm_attach(nbdev, i915_pciidlist); } Will rebuild and test.. Thanks!