On Thu, 2003-09-25 at 10:44, Linus Torvalds wrote: > Ok, I've merged the current DRI CVS tree from freedesktop.org into the > kernel, and as a result I now have another (pretty obvious) diff for > back-merging into DRI. I hope somebody with commit access will do this. > > The merge has three parts: > > - a real fix for an i830_irq.c misfeature, where the DRI code initializes > counters and a wait-queue _after_ having enabled interrupts. Yeah, > there shouldn't be any events pending since the thing should be > quiescent and we just cleared the interrupt sources, but it's still not > good practice. > > So move the clearing to the pre-irq-install. > > - Update the Kconfig file for the SiS driver to the new realities of not > needing the SISFB driver to compile. > > This is probably not an issue for anybody who compiles the > out-of-kernel version, since they won't be using the kernel > configurator, but it's an easier merge, and it's obviously correct. > > - whitespace fixes. The DRI tree had a number of whitespace fixes to the > i810 driver that I merged into the kernel - but whenever I merged a > whitespace change I made sure to merge the _proper_ whitespace. No > mixed space/tab crud at the beginning of lines. > > As a result, I now have a pure whitespace diff that I try to push back > into the DRI tree. > > All of these should be totally obvious patches, but they may apply with > some offset because I edited out the other parts of the merge. Can > somebody apply them or indicate why they shouldn't be applied. > > [ The whitespace noise should be fine, since there should be no issues > with merging this back into XF86 - since all development to the files > involved happens either in the kernel tree or in the DRI tree. So it > shouldn't cause any merge issues down the line - it only helps merging > with the kernel. I obviously don't know what the merge issues are for > the *BSD versions.. ]
I applied the radeon.h and the Kconfig patches (redone, since whitespace got mangled in the email). I've posted a more agressive whitespace cleanup of i810_dma.c. I don't want to commit such a big whitespace diff without the i810 maintainer's approval. http://people.freebsd.org/~anholt/dri/files/i810-whitespace.diff Keith, what's the status of the new i830 stuff? Is it going to be merged to trunk soon, or should we put things in trunk in the meantime (I'm thinking of this i830 fix, the BSD fixes you've made)? -- Eric Anholt [EMAIL PROTECTED] http://people.freebsd.org/~anholt/ [EMAIL PROTECTED] ------------------------------------------------------- This sf.net email is sponsored by:ThinkGeek Welcome to geek heaven. http://thinkgeek.com/sf _______________________________________________ Dri-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/dri-devel
