From owner-freebsd-x11@FreeBSD.ORG Wed Mar 11 03:31:55 2009 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 300AB1065726 for ; Wed, 11 Mar 2009 03:31:55 +0000 (UTC) (envelope-from alex@mailinglist.ahhyes.net) Received: from mail08.syd.optusnet.com.au (mail08.syd.optusnet.com.au [211.29.132.189]) by mx1.freebsd.org (Postfix) with ESMTP id 5236C8FC18 for ; Wed, 11 Mar 2009 03:31:54 +0000 (UTC) (envelope-from alex@mailinglist.ahhyes.net) Received: from desktop.xor.net (c122-106-76-0.rivrw1.nsw.optusnet.com.au [122.106.76.0]) by mail08.syd.optusnet.com.au (8.13.1/8.13.1) with ESMTP id n2B3VoIZ016711 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 11 Mar 2009 14:31:51 +1100 Message-ID: <49B72FEC.2090909@mailinglist.ahhyes.net> Date: Wed, 11 Mar 2009 14:28:44 +1100 From: Alex User-Agent: Thunderbird 2.0.0.19 (X11/20090221) MIME-Version: 1.0 To: freebsd-x11@freebsd.org References: <20090305161651.GB1369@lobo.ewinter.org> <1236275215.1384.50.camel@widget.2hip.net> <20090305180523.GA2039@lobo.ewinter.org> <20090306133119.1af6894c@ernst.jennejohn.org> <1236363408.55221.16.camel@balrog.2hip.net> <20090306203055.582faa02@ernst.jennejohn.org> <1236371734.1671.5.camel@balrog.2hip.net> <49B3D755.2050308@phat.za.net> <1236536316.1778.22.camel@balrog.2hip.net> <49B42548.3000308@phat.za.net> <49B57ACD.5030405@phat.za.net> <1236741375.2091.32.camel@balrog.2hip.net> In-Reply-To: <1236741375.2091.32.camel@balrog.2hip.net> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: Radeon DRIVER 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: Wed, 11 Mar 2009 03:31:55 -0000 Hi Robert, Encountered some failures (I did csup my source before attempting the patch). Patching file sys/dev/drm/radeon_cp.c using Plan A... Hunk #1 succeeded at 1. Hunk #2 succeeded at 33. Hunk #3 succeeded at 144. Hunk #4 succeeded at 186. Hunk #5 succeeded at 260. Hunk #6 succeeded at 296. Hunk #7 succeeded at 364. Hunk #8 succeeded at 393. Hunk #9 succeeded at 404. Hunk #10 succeeded at 426. Hunk #11 succeeded at 461. Hunk #12 succeeded at 516. Hunk #13 succeeded at 642. Hunk #14 succeeded at 699. Hunk #15 succeeded at 751. Hunk #16 succeeded at 771. Hunk #17 succeeded at 782. Hunk #18 succeeded at 817. Hunk #19 succeeded at 849. Hunk #20 succeeded at 863. Hunk #21 succeeded at 895. Hunk #22 succeeded at 909. Hunk #23 succeeded at 919. Hunk #24 succeeded at 927. Hunk #25 succeeded at 1044. Hunk #26 succeeded at 1080. Hunk #27 succeeded at 1134. Hunk #28 succeeded at 1161. Hunk #29 succeeded at 1219. Hunk #30 succeeded at 1291. Hunk #31 succeeded at 1304. Hunk #32 succeeded at 1405. Hunk #33 succeeded at 1416. Hunk #34 succeeded at 1460. Hunk #35 succeeded at 1533. Hunk #36 succeeded at 1560. Hunk #37 succeeded at 1583. Hunk #38 succeeded at 1595. Hunk #39 succeeded at 1607. Hunk #40 succeeded at 1637. Hunk #41 succeeded at 1671. Hunk #42 succeeded at 1683. Hunk #43 succeeded at 1705. Hunk #44 succeeded at 1760. Hunk #45 succeeded at 1781. Hunk #46 succeeded at 1799. Hunk #47 succeeded at 1878. Hunk #48 succeeded at 1912. Hunk #49 succeeded at 2082. Hunk #50 failed at 2089. Hunk #51 succeeded at 2111 (offset -6 lines). Hunk #52 succeeded at 2126 (offset -6 lines). 1 out of 52 hunks failed--saving rejects to sys/dev/drm/radeon_cp.c.rej [root@desktop /usr/src]# cat sys/dev/drm/radeon_cp.c.rej *************** *** 1751,1756 **** else dev_priv->flags |= RADEON_IS_PCI; ret = drm_vblank_init(dev, 2); if (ret) { radeon_driver_unload(dev); --- 2089,2100 ---- else dev_priv->flags |= RADEON_IS_PCI; + ret = drm_addmap(dev, drm_get_resource_start(dev, 2), + drm_get_resource_len(dev, 2), _DRM_REGISTERS, + _DRM_READ_ONLY | _DRM_DRIVER, &dev_priv->mmio); + if (ret != 0) + return ret; + ret = drm_vblank_init(dev, 2); if (ret) { radeon_driver_unload(dev); Robert Noland wrote: > On Mon, 2009-03-09 at 22:23 +0200, Aragon Gouveia wrote: > >> Aragon Gouveia wrote: >> >>> Robert Noland wrote: >>> >>>> On Sun, 2009-03-08 at 16:33 +0200, Aragon Gouveia wrote: >>>> >>>>> Patch output is pasted below. The unsuccessful hunk in radeon_cp.c I >>>>> wedged in by hand. In a few hours I hope to report on the results of >>>>> upgrading to Xorg 7.4 and latest radeonhd-devel. Running Xorg 7.3 >>>>> and video-ati-6.9.0 at the moment. >>>>> >>>>> >>>> On -STABLE you also need the "Move vblank_init to load time" patch >>>> first. That will make the patch fail on the i915 driver, but if you >>>> aren't using that one, it should be ok, as long as it compiles. I'll >>>> merge all of this within a couple of weeks. >>>> >>> I'll grab the vblank patch before going further with the Xorg and >>> radeonhd upgrade. Thanks! >>> >> I have applied both kernel patches, recompiled, rebooted, upgraded to >> Xorg 7.4, upgraded to radeonhd-devel from ports. The kernel is still >> seeing my card: >> >> vgapci0: port 0x2000-0x20ff mem >> 0xd0000000-0xdfffffff,0xe0200000-0xe020ffff irq 16 at device 0.0 on pci1 >> drm0: on vgapci0 >> vgapci0: child drm0 requested pci_enable_busmaster >> info: [drm] Initialized radeon 1.29.0 20080528 >> >> Enabling DRI and Exa in xorg.conf causes my display to go blank during X >> startup and I'm left with no other way out except hitting my power >> button and shutting down. >> >> Enabling Exa with DRI disabled is wildly slow. >> >> Leaving both disabled works fine, but no Xv. :) >> >> Please let me know if I can provide more info to debug this. >> >> > > Ok, let's try this again... new patchset without using svn diff. > > http://people.freebsd.org/~rnoland/drm-7-synced-to-HEAD-031009.patch > > Note that I MFC several things just a little while ago, so make sure > that you -STABLE is updated. > > robert. > > >> Thanks, >> Aragon >> >>