[PATCH] fix drm_i915_flip_t breakage

[Brian Paul]

Jesse Barnes wrote:
> On Friday, September 28, 2007 9:27 am Brian Paul wrote:
>> 1. The Mesa 7.0.2 branch doesn't build with drm/master.
>>
>> Compiling dri_bufmgr.c:
>>
>> ../common/dri_bufmgr.c: In function ‘driFenceBuffers’:
>> ../common/dri_bufmgr.c:102: warning: passing argument 3 of
>> ‘drmFenceBuffers’ makes integer from pointer without a cast
>> ../common/dri_bufmgr.c:102: error: too few arguments to function
>> ‘drmFenceBuffers’
> 
> I'm not sure about this one...
> 
>> Compiling i915tex/intel_buffers.c:
>>
>> intel_buffers.c: In function ‘intelWindowMoved’:
>> intel_buffers.c:290: error: ‘drm_i915_flip_t’ has no member named
>> ‘pipes’ intel_buffers.c:298: error: ‘drm_i915_flip_t’ has no member
>> named ‘pipes’ intel_buffers.c: In function ‘intelPageFlip’:
>> intel_buffers.c:764: error: ‘drm_i915_flip_t’ has no member named
>> ‘pipes’
>>
>> Is this supposed to work?  If so, please fix it.
> 
> Yes this should work but I broke it.  I've checked in fixes to 
> drm/master, mesa/master, and xf86-video-intel/master that should make 
> things forward & backward compatible again.  Again, sorry for the 
> trouble.  I suck.

Thanks, I'll re-test later.


>> 2. Mesa/master builds and runs but gears, for example, is limping
>> along at 83 fps (using >90% CPU).  Can you test and see what you get?
>>
>> Other demos are exhibiting rendering errors that I don't recall
>> seeing before (such as demos/gloss and demos/fogcoord).
>>
>> Also, I had a total system lock-up when I exited gears at one point.
> 
> I haven't seen this, but I haven't tried master since Eric checked in 
> his TTM stuff...

I'm hoping Eric can do a few quick tests...  I could certainly have 
something wrong on my end so I'd like to get another datapoint one way 
or another.


>> There's been a lot of changes lately and I don't know who's
>> responsible for the regressions but they need to be addressed.
> 
> Are you planning to do a release soon?

Yes, I announced plans for a 7.0.2 release on the Mesa3d-dev list a 
couple days ago.

-Brian