mesa: Branch 'master'

[Haihao Xiang]

 src/mesa/drivers/dri/i965/intel_ioctl.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

New commits:
diff-tree 1e6688742e6a6e11d002c1fce5dca3da3d58594f (from ebcc9b5d12995cc83c032beeff468c5ecb30b33f)
Author: Xiang, Haihao <haihao.xiang at intel.com>
Date:   Mon Feb 12 16:38:50 2007 +0800

    I965: fix a failure on waiting irq.
    
    Wait until getting the right fence if drm/i915 resets the
    counter.

diff --git a/src/mesa/drivers/dri/i965/intel_ioctl.c b/src/mesa/drivers/dri/i965/intel_ioctl.c
index 4da3127..0a8e976 100644
--- a/src/mesa/drivers/dri/i965/intel_ioctl.c
+++ b/src/mesa/drivers/dri/i965/intel_ioctl.c
@@ -108,7 +108,8 @@ void intelWaitIrq( struct intel_context 
 
 	 /* This seems quite often to return before it should!?! 
 	  */
-      } while (ret == -EAGAIN || ret == -EINTR || (ret == -EBUSY && lastdispatch != intel->sarea->last_dispatch) || (ret == 0 && seq > intel->sarea->last_dispatch));
+      } while (ret == -EAGAIN || ret == -EINTR || (ret == -EBUSY && lastdispatch != intel->sarea->last_dispatch) || (ret == 0 && seq > intel->sarea->last_dispatch)
+	       || (ret == 0 && intel->sarea->last_dispatch - seq >= (1 << 24)));
       
 
       if ( ret ) {