On Thu, 2004-02-12 at 00:26, Hod McWuff wrote: > On Wed, 2004-02-11 at 17:28, Michel DÃnzer wrote: > > By the way, where can I find a three-way merge tool? ;)
I like meld, for example. > I've found Gatos-related changes in radeon_cp.c, radeon_drv.h, and > radeon_state.c. I've reimplemented what changes I could find... They're mostly superfluous AFAICT. Again, the DRM in current DRI CVS should basically work with the GATOS 2D driver, that one just needs to set up things similarly to how the 2D driver in DRI CVS does. > > The DRM and 3D driver in current DRI CVS should theoretically be able to > > work with their 2D driver. Its aperture setup may have to be changed > > slightly though. > > The one in 2.6.2 works with 2D (after faking the version number) Faking the version number is obviously a bad idea. The GATOS 2D driver should work with the 1.10.0 radeon DRM with the changes described above. The GATOS 3D driver only works with the old GATOS DRM and 2D driver, but the 3D driver in current DRI CVS should work with anything, or at least fail gracefully. > 2.6.2-update.patch merges current DRI CVS into the 2.6.2 tree BTW, AFAIK the DRM in the -mm kernel tree is already fairly up to date. Some of the stuff in DRI CVS is only needed for compatibility with older kernels etc. -- Earthling Michel DÃnzer | Debian (powerpc), X and DRI developer Libre software enthusiast | http://svcs.affero.net/rm.php?r=daenzer ------------------------------------------------------- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps & Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click -- _______________________________________________ Dri-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/dri-devel
