From owner-cvs-src@FreeBSD.ORG Sun Nov 20 00:50:29 2005 Return-Path: X-Original-To: cvs-src@FreeBSD.org Delivered-To: cvs-src@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5BB3F16A431; Sun, 20 Nov 2005 00:50:29 +0000 (GMT) (envelope-from nate@root.org) Received: from www.cryptography.com (li-22.members.linode.com [64.5.53.22]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0052743D4C; Sun, 20 Nov 2005 00:50:24 +0000 (GMT) (envelope-from nate@root.org) Received: from [10.0.5.50] (ppp-71-139-0-107.dsl.snfc21.pacbell.net [71.139.0.107]) by www.cryptography.com (8.12.8/8.12.8) with ESMTP id jAK0oQDe019801 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Sat, 19 Nov 2005 16:50:27 -0800 Message-ID: <437FC830.9050704@root.org> Date: Sat, 19 Nov 2005 16:49:52 -0800 From: Nate Lawson User-Agent: Mozilla Thunderbird 1.0.6 (Windows/20050716) X-Accept-Language: en-us, en MIME-Version: 1.0 To: eta@lclark.edu References: <200511142114.jAELEEOH054935@repoman.freebsd.org> <20051119162326.GS5197@obiwan.tataz.chchile.org> <1132433591.93970.85.camel@leguin> In-Reply-To: <1132433591.93970.85.camel@leguin> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, Jeremie Le Hen , cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sys/conf files.i386 src/sys/modules/agp Makefile src/sys/pci agp_ati.c agpreg.h X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Nov 2005 00:50:30 -0000 Eric Anholt wrote: > On Sat, 2005-11-19 at 17:23 +0100, Jeremie Le Hen wrote: > >>Hi, Eric, >> >>On Mon, Nov 14, 2005 at 09:14:14PM +0000, Eric Anholt wrote: >> >>>anholt 2005-11-14 21:14:14 UTC >>> >>> FreeBSD src repository >>> >>> Modified files: (Branch: RELENG_6) >>> sys/conf files.i386 >>> sys/modules/agp Makefile >>> sys/pci agpreg.h >>> Added files: (Branch: RELENG_6) >>> sys/pci agp_ati.c >>> Log: >>> MFC: ATI IGP AGP driver. >> >>Please, excuse my ignorance, but I have absolutely no skills about this >>kind of things. However, I'm quite interested in ATI drivers as my >>ATI X700 doesn't work with X.Org currently. >> >>What is the purpose of this driver ? I feel this is not the DRM driver, >>but I don't know what is this "ATI IGP AGP driver". > > > Right, it's not the DRM driver, it's the AGP driver for ATI's integrated > (IGP) graphics chipsets. If you want support for your X700, you > probably need to grab the drm from DRM CVS, along with > graphics/dri-devel and x11-server/xorg-server-snap. I'm actually about > ready to merge that DRM to -current, but I want to do something a new > way for that merge. > > I'd like to avoid going through p4 for merging. The DRM is really > contrib code, and the local diffs from other committers that we > occasionally have in FreeBSD need to just get pushed upstream. So the > differences between DRM CVS and DRM CVS integrated into FreeBSD are: > - replace #include "blah.h" with #include "dev/drm/blah.h". I'm going > to avoid this using sys/conf/files compile-with lines now. > - add $FreeBSD$ to all files after the copyright block, since our cvs > checkin scripts demand it. > - Replace /* with /*- for copyright blocks > > Could someone make up a script for those last 2 steps? It would > probably make us get DRM into FreeBSD faster if I didn't have to > interact with 3 different repositories to do so every time. > You should do all 3 steps from a script since I think compile-with has just been swept from the tree by obrien@. Warner has a script to do the /*- thing. -- Nate