On Wed, 2004-02-11 at 19:03, Michel Dänzer wrote: > 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'll look into it. By the way, is there an index of CVS tags by date? Or should I just try to pull something by a date near when the first Gatos commits were made? > > > 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. I see two types of changes; adding dev_priv->fb_offset, and doing some bit masking. There's also the spot in radeon_cp where it appears to write a couple of new initializations to the card. You're sure those are superfluous? They're the only substantial differences I've been able to pick out thus far. OTOH, they haven't produced the desired result yet. Just to make sure we're on the same page, I'm doing all of my testing with XFree 4.3.0 plus Gatos ati.2. In all cases except in between the patch states I've outlined, 2D and TV (xawtv) work just fine. The only variable is whether DRI connects to DRM, whether it produces visible output, whether it locks on some apps or not. Software rendering, of course, works fine as long as the DRI isn't connected to a faulty DRM. > > > > > 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 The Gatos 3D driver won't even try to work unless the DRM version number is 1.100.0 or better. > should work with the 1.10.0 radeon DRM with the changes described above. Those changes are exactly what I'm trying to isolate and port to the current CVS DRM. > 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. It fails gracefully, meaning the XFree logs show it rejecting the DRM outright. If I change the version number, things seem to work but the windows are always full of unchanging black. I realize you know better than I what does and doesn't work. The issue I'm trying to address is why, so that shortly we can have everything in the does-work category. > > > > 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. Good to know, but I'm more comfortable hacking against the vanilla tree, and it makes no sense to develop a patch against an obsolete version. I will look at the DRM changes in -mm compared to what I just merged, though. > Some of the stuff in DRI CVS is only needed for compatibility with older > kernels etc. > I noticed that, but those are easy to strip back out later. An overloaded source makes it a little easier to pick out the kernel version differences from DRM version differences. As an aside though, perhaps a unified source is a good idea. It would make it trivial to keep the various kernel trees up-to-date, and the short patches to strip out 2.4 or 2.6 specific stuff probably wouldn't change often. ------------------------------------------------------- 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_id56&alloc_id438&op=click -- _______________________________________________ Dri-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/dri-devel
