Re: [Dri-devel] Re: GATOS and DRI merge

2004-02-14 Thread Michel Dänzer
On Sun, 2004-02-15 at 00:45, Vladimir Dergachev wrote: > > Code that handles trasferred apertures - this code looks like it adds a > constant value (aperture location in PCI address space) to some values, > but not others. > > You need to ask DRM driver to transfer aperture to the same position >

Re: [Dri-devel] Re: GATOS and DRI merge

2004-02-14 Thread Vladimir Dergachev
> > > > 2. *_video.c files - these are heavily modified. Take care of atixv.c - > > Marc Aurele merged part of GATOS code into XFree86 > > Yes, I noticed that... these files were *FULL* of conflicts against the > current DRI CVS... to the extent that I'm worried about being able to > untangle

Re: [Dri-devel] Re: GATOS and DRI merge

2004-02-14 Thread Hod McWuff
On Sat, 2004-02-14 at 10:53, Vladimir Dergachev wrote: > Checkout HEAD (and/or tv_output) branches from GATOS CVS. > > Checkout "orig" branch - this is the original XFree86 code we started > from. > > diff -u one against the other. Doing that now. I'd been working against a pristine copy of

Re: [Dri-devel] Re: GATOS and DRI merge

2004-02-14 Thread Vladimir Dergachev
Hi Hod, There is an easy way to generate patch with GATOS-specific changes: Checkout HEAD (and/or tv_output) branches from GATOS CVS. Checkout "orig" branch - this is the original XFree86 code we started from. diff -u one against the other. The changes should classify as following: 1

Re: [Dri-devel] Re: GATOS and DRI merge

2004-02-12 Thread Hod McWuff
On Thu, 2004-02-12 at 18:09, Ian Romanick wrote: > I'd go the other way around. *If* all that GATOS needed to modify (to > add their new functionality) was in the 2D driver, take a current DRI > CVS and merge in the changes from > programs/Xserver/hw/xfree86/drivers/ati (the 2D driver) that are

Re: [Dri-devel] Re: GATOS and DRI merge

2004-02-12 Thread Ian Romanick
Hod McWuff wrote: So my objective should be to replace the Gatos 3D driver with the stock DRI 3D driver? What are the relevant files? Somewhere under xc/programs/Xserver/hw/xfree86/drivers/ati I'd assume, that's all that Gatos touches. < pauses while head spins 1440 degrees clockwise > Just so I'

Re: [Dri-devel] Re: GATOS and DRI merge

2004-02-12 Thread Hod McWuff
On Thu, 2004-02-12 at 16:58, Michel Dänzer wrote: > On Thu, 2004-02-12 at 18:24, Hod McWuff wrote: > > On Thu, 2004-02-12 at 11:58, Michel Dänzer wrote: > > > > > Forget about the GATOS 3D drivers. The current DRM can deal with any others. > > > > Gatos DRM forgotten. > > 3D driver != DRM I've

Re: [Dri-devel] Re: GATOS and DRI merge

2004-02-12 Thread Michel Dänzer
On Thu, 2004-02-12 at 18:24, Hod McWuff wrote: > On Thu, 2004-02-12 at 11:58, Michel DÃnzer wrote: > > > Forget about the GATOS 3D drivers. The current DRM can deal with any others. > > Gatos DRM forgotten. 3D driver != DRM > As I'm beginning to get clear, there is a now-unnecessary initializ

Re: [Dri-devel] Re: GATOS and DRI merge

2004-02-12 Thread Hod McWuff
On Thu, 2004-02-12 at 11:28, Ian Romanick wrote: > changes made by the GATOS team to the DRM were purely to support changes > in the memory layout expected by their 2D driver, and the changes to the > 3D driver were purely to work with the changes in the 3D driver. I'm assuming you meant to say,

Re: [Dri-devel] Re: GATOS and DRI merge

2004-02-12 Thread Hod McWuff
On Thu, 2004-02-12 at 11:58, Michel Dänzer wrote: > No, I mean cvs log . It shows the tag<->revision and > revision<->time (and by extension tag<->time) correspondence. Thanks. That'll help. > Forget about the GATOS 3D drivers. The current DRM can deal with any others. Gatos DRM forgotten. The

Re: [Dri-devel] Re: GATOS and DRI merge

2004-02-12 Thread Michel Dänzer
On Thu, 2004-02-12 at 17:28, Ian Romanick wrote: > > Michel, is my understanding of the situation correct? Yes, thank you for helping make it clear. :) -- Earthling Michel DÃnzer | Debian (powerpc), X and DRI developer Libre software enthusiast| http://svcs.affero.net/rm.php?r=d

Re: [Dri-devel] Re: GATOS and DRI merge

2004-02-12 Thread Michel Dänzer
On Thu, 2004-02-12 at 16:59, Hod McWuff wrote: > On Thu, 2004-02-12 at 08:26, Michel DÃnzer wrote: > > On Thu, 2004-02-12 at 03:21, Hod McWuff wrote: > > > On Wed, 2004-02-11 at 19:03, Michel DÃnzer wrote: > > > > > > By the way, is there an index of CVS tags by date? Or should I just try > > > t

Re: [Dri-devel] Re: GATOS and DRI merge

2004-02-12 Thread Ian Romanick
Hod McWuff wrote: 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: 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... T

Re: [Dri-devel] Re: GATOS and DRI merge

2004-02-12 Thread Hod McWuff
On Thu, 2004-02-12 at 08:26, Michel Dänzer wrote: > On Thu, 2004-02-12 at 03:21, Hod McWuff wrote: > > 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, is there an in

Re: [Dri-devel] Re: GATOS and DRI merge

2004-02-12 Thread Michel Dänzer
On Thu, 2004-02-12 at 03:21, Hod McWuff wrote: > 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, is there an index of CVS tags by date? Or should I just try > to pull somet

Re: [Dri-devel] Re: GATOS and DRI merge

2004-02-12 Thread Hod McWuff
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 ind

Re: [Dri-devel] Re: GATOS and DRI merge

2004-02-11 Thread Michel Dänzer
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

Re: [Dri-devel] Re: GATOS and DRI merge

2004-02-11 Thread Michel Dänzer
On Wed, 2004-02-11 at 08:20, Hod McWuff wrote: > > That's not what I meant - I mean, what big things have happened in the > *DRI* tree since the Gatos fork. I need an idea of that to be able to > sort gatos-related changes from simple base-version differences. Once you have found the common ances

[Dri-devel] Re: GATOS and DRI merge

2004-02-11 Thread Hod McWuff
On Wed, 2004-02-11 at 01:41, Mike A. Harris wrote: > On Tue, 10 Feb 2004, Hod McWuff wrote: > > >So, to summarize, I need to know *roughly* what's changed since the > >Gatos folks forked, in terms of what-moved-where and an idea of any > >structural changes. I can read the different sources and fi

[Dri-devel] Re: GATOS and DRI merge

2004-02-10 Thread Mike A. Harris
On Tue, 10 Feb 2004, Hod McWuff wrote: >So, to summarize, I need to know *roughly* what's changed since the >Gatos folks forked, in terms of what-moved-where and an idea of any >structural changes. I can read the different sources and figure out the >code changes myself, but I need to know what I'