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 X-4.3.0.
>
> The changes should classify as following:
>
> 1. New code - i.e. theatre.c files and others
Plus the various tuner drivers. These were indeed easy ;) although, I
might have to put some more thought into merging the Imakefiles.+
>
> 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 them. Something like 140K of .rej files between radeon_video.c
and atixv.c. It would help to know from the DRI folks, if they've done
any major structural changes or if this is just bugfixes and minor code
movement.
> 3. *_driver.c files were modified to allow for new options
There were some conflicts here, but nothing I can't sift out by hand.
> 4. there should be changes to DRI that programs memory controller to
> move apertures (from chips point of view) so as to allow for PCI DMA.
>
> These are matched by changes in drm-kernel and Mesa driver. They
> are just a few lines.
>
> All of these are best thrown out and instead new code should make use
> of ability of DRI CVS to change these settings dynamically.
OK, can someone give me an idea of what calls I'm looking for, and what
they should be doing instead? Are we talking strictly about what's in
{radeon,r128}_dri.c?
>From what I understand the changes in this area are the main cause of my
problems. I can isolate what Gatos changed in this file, sure, but I
have no idea what to replace it with.
> 5. They are might be a few fixes (1 or 2) that are, strictly speaking,
> outside the scope of GATOS code (like DPMS and such) and were
> backported from XFree86 CVS tree. If they are indeed there they should
> be easy to spot.
I'm guessing the changes to atiprobe.c fall into this category
atiregs.h seems to mostly be this sort of change, I'll have to pick
through by hand to be sure... also there seem to have been a few
endianness fixes merged in.
Thanks for responding,
- Hod McWuff
-------------------------------------------------------
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
