On Wed, 1 May 2002, Frank C. Earl wrote: > > The part which is missing is more or less what we have in the > > mach64-0-0-4-branch, except that the state update is still being made with > > MMIO. So either we add the remaining parts to mach64-0-0-3-branch or we > > bring Frank's changes to mach64-0-0-4-branch. Personally I'm more in favor > > of the later, since it will avoid redundant work of merging back and > > forward, and will also enable the PowerPC architecture to participate in > > testing. > > I'm for it, I was going to actually consider doing that very thing but the > fun on my end of things just kept me distracted enough that I couldn't sit > down and just code the whole thing. For the record, NEVER stay around at a > company if they don't do a consistent and regular payroll run at the > appointed times per their policies- any inconsistencies show in that > situation, you should leave it right then and there.
Frank, I merged your changes by hand into my 0-0-4 local tree and it compiles and runs (of course not using the interrupt path yet). Since we don't call the ioctl to install the interrupt handler yet, that path isn't used. A couple of changes I made were omitting some of the includes that drmP.h already includes and changing DMA(dma_immediate_bh) to mach64_dma_immediate_bh (which is the same thing). There were some changes already made in 0-0-4 that I ommitted, but there weren't many conflicts. I'm attaching the patch against 0-0-4 so you can take a look at it. If it looks ok as a starting point, I can check it in. -- Leif Delgass http://www.retinalburn.net
mach64-dma-merge.diff.gz
Description: GNU Zip compressed data
