From owner-freebsd-x11@FreeBSD.ORG Wed Mar 11 04:35:51 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 2B957106566B for ; Wed, 11 Mar 2009 04:35:51 +0000 (UTC) (envelope-from rnoland@2hip.net) Received: from gizmo.2hip.net (gizmo.2hip.net [64.74.207.195]) by mx1.freebsd.org (Postfix) with ESMTP id D158A8FC08 for ; Wed, 11 Mar 2009 04:35:50 +0000 (UTC) (envelope-from rnoland@2hip.net) Received: from [192.168.1.156] (adsl-241-168-218.bna.bellsouth.net [74.241.168.218]) (authenticated bits=0) by gizmo.2hip.net (8.14.3/8.14.3) with ESMTP id n2B4YPdI013816 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 11 Mar 2009 00:34:26 -0400 (EDT) (envelope-from rnoland@2hip.net) From: Robert Noland To: Alex In-Reply-To: <49B72FEC.2090909@mailinglist.ahhyes.net> 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> <49B72FEC.2090909@mailinglist.ahhyes.net> Content-Type: multipart/signed; micalg="pgp-sha1"; protocol="application/pgp-signature"; boundary="=-rHgLtUAxnaBAjjmtV+6z" Organization: 2 Hip Networks Date: Tue, 10 Mar 2009 23:35:27 -0500 Message-Id: <1236746127.2091.33.camel@balrog.2hip.net> Mime-Version: 1.0 X-Mailer: Evolution 2.24.5 FreeBSD GNOME Team Port X-Spam-Status: No, score=-1.4 required=5.0 tests=AWL,BAYES_00, MIME_QP_LONG_LINE,RCVD_IN_PBL,RDNS_DYNAMIC autolearn=no version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on gizmo.2hip.net Cc: freebsd-x11@freebsd.org 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 04:35:51 -0000 --=-rHgLtUAxnaBAjjmtV+6z Content-Type: text/plain Content-Transfer-Encoding: quoted-printable On Wed, 2009-03-11 at 14:28 +1100, Alex wrote: > Hi Robert, >=20 > Encountered some failures (I did csup my source before attempting the=20 > patch). Let the mirrors catch up... I just finished MFC before I made the patch. robert. > Patching file sys/dev/drm/radeon_cp.c using Plan=20 > A... = = =20 >=20 > Hunk #1 succeeded at=20 > 1. = = = =20 >=20 > Hunk #2 succeeded at=20 > 33. = = = =20 >=20 > Hunk #3 succeeded at=20 > 144. = = = =20 >=20 > Hunk #4 succeeded at=20 > 186. = = = =20 >=20 > Hunk #5 succeeded at=20 > 260. = = = =20 >=20 > Hunk #6 succeeded at=20 > 296. = = = =20 >=20 > Hunk #7 succeeded at=20 > 364. = = = =20 >=20 > Hunk #8 succeeded at=20 > 393. = = = =20 >=20 > Hunk #9 succeeded at=20 > 404. = = = =20 >=20 > Hunk #10 succeeded at=20 > 426. = = = =20 >=20 > Hunk #11 succeeded at=20 > 461. = = = =20 >=20 > Hunk #12 succeeded at=20 > 516. = = = =20 >=20 > Hunk #13 succeeded at=20 > 642. = = = =20 >=20 > Hunk #14 succeeded at=20 > 699. = = = =20 >=20 > Hunk #15 succeeded at=20 > 751. = = = =20 >=20 > Hunk #16 succeeded at=20 > 771. = = = =20 >=20 > Hunk #17 succeeded at=20 > 782. = = = =20 >=20 > Hunk #18 succeeded at=20 > 817. = = = =20 >=20 > Hunk #19 succeeded at=20 > 849. = = = =20 >=20 > Hunk #20 succeeded at=20 > 863. = = = =20 >=20 > Hunk #21 succeeded at=20 > 895. = = = =20 >=20 > Hunk #22 succeeded at=20 > 909. = = = =20 >=20 > Hunk #23 succeeded at=20 > 919. = = = =20 >=20 > Hunk #24 succeeded at=20 > 927. = = = =20 >=20 > Hunk #25 succeeded at=20 > 1044. = = = =20 >=20 > Hunk #26 succeeded at=20 > 1080. = = = =20 >=20 > Hunk #27 succeeded at=20 > 1134. = = = =20 >=20 > Hunk #28 succeeded at=20 > 1161. = = = =20 >=20 > Hunk #29 succeeded at=20 > 1219. = = = =20 >=20 > Hunk #30 succeeded at=20 > 1291. = = = =20 >=20 > Hunk #31 succeeded at=20 > 1304. = = = =20 >=20 > Hunk #32 succeeded at=20 > 1405. = = = =20 >=20 > Hunk #33 succeeded at=20 > 1416. = = = =20 >=20 > Hunk #34 succeeded at=20 > 1460. = = = =20 >=20 > Hunk #35 succeeded at=20 > 1533. = = = =20 >=20 > Hunk #36 succeeded at=20 > 1560. = = = =20 >=20 > Hunk #37 succeeded at=20 > 1583. = = = =20 >=20 > Hunk #38 succeeded at=20 > 1595. = = = =20 >=20 > Hunk #39 succeeded at=20 > 1607. = = = =20 >=20 > Hunk #40 succeeded at=20 > 1637. = = = =20 >=20 > Hunk #41 succeeded at=20 > 1671. = = = =20 >=20 > Hunk #42 succeeded at=20 > 1683. = = = =20 >=20 > Hunk #43 succeeded at=20 > 1705. = = = =20 >=20 > Hunk #44 succeeded at=20 > 1760. = = = =20 >=20 > Hunk #45 succeeded at=20 > 1781. = = = =20 >=20 > Hunk #46 succeeded at=20 > 1799. = = = =20 >=20 > Hunk #47 succeeded at=20 > 1878. = = = =20 >=20 > Hunk #48 succeeded at=20 > 1912. = = = =20 >=20 > Hunk #49 succeeded at=20 > 2082. = = = =20 >=20 > Hunk #50 failed at=20 > 2089. = = = =20 >=20 > Hunk #51 succeeded at 2111 (offset -6=20 > lines). = = = =20 >=20 > Hunk #52 succeeded at 2126 (offset -6=20 > lines). = = = =20 >=20 > 1 out of 52 hunks failed--saving rejects to sys/dev/drm/radeon_cp.c.rej >=20 > [root@desktop /usr/src]# cat sys/dev/drm/radeon_cp.c.rej > *************** > *** 1751,1756 **** > else > dev_priv->flags |=3D RADEON_IS_PCI; >=20 > ret =3D drm_vblank_init(dev, 2); > if (ret) { > radeon_driver_unload(dev); > --- 2089,2100 ---- > else > dev_priv->flags |=3D RADEON_IS_PCI; >=20 > + ret =3D 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 !=3D 0) > + return ret; > + > ret =3D drm_vblank_init(dev, 2); > if (ret) { > radeon_driver_unload(dev); >=20 >=20 >=20 > Robert Noland wrote: > > On Mon, 2009-03-09 at 22:23 +0200, Aragon Gouveia wrote: > > =20 > >> Aragon Gouveia wrote: > >> =20 > >>> Robert Noland wrote: > >>> =20 > >>>> On Sun, 2009-03-08 at 16:33 +0200, Aragon Gouveia wrote: > >>>> =20 > >>>>> Patch output is pasted below. The unsuccessful hunk in radeon_cp.c= I=20 > >>>>> wedged in by hand. In a few hours I hope to report on the results = of=20 > >>>>> upgrading to Xorg 7.4 and latest radeonhd-devel. Running Xorg 7.3=20 > >>>>> and video-ati-6.9.0 at the moment. > >>>>> > >>>>> =20 > >>>> 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'l= l > >>>> merge all of this within a couple of weeks. > >>>> =20 > >>> I'll grab the vblank patch before going further with the Xorg and=20 > >>> radeonhd upgrade. Thanks! > >>> =20 > >> I have applied both kernel patches, recompiled, rebooted, upgraded to=20 > >> Xorg 7.4, upgraded to radeonhd-devel from ports. The kernel is still=20 > >> seeing my card: > >> > >> vgapci0: port 0x2000-0x20ff mem=20 > >> 0xd0000000-0xdfffffff,0xe0200000-0xe020ffff irq 16 at device 0.0 on pc= i1 > >> 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=20 > >> startup and I'm left with no other way out except hitting my power=20 > >> 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. > >> > >> =20 > > > > Ok, let's try this again... new patchset without using svn diff. =20 > > > > 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. > > > > =20 > >> Thanks, > >> Aragon > >> > >> =20 >=20 > _______________________________________________ > freebsd-x11@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-x11 > To unsubscribe, send any mail to "freebsd-x11-unsubscribe@freebsd.org" --=20 Robert Noland 2 Hip Networks --=-rHgLtUAxnaBAjjmtV+6z Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.11 (FreeBSD) iEYEABECAAYFAkm3P48ACgkQM4TrQ4qfROPGlwCeP1dfml2H0LlK1/NYK1VupkHk ySMAniWwjmFkF7PvV8wO/fSpowhJv0hc =zL1V -----END PGP SIGNATURE----- --=-rHgLtUAxnaBAjjmtV+6z--