Adapt to updated libdrm.

8 files changed, 13 insertions, 18 deletions

diff --git a/src/mesa/drivers/dri/common/dri_bufmgr.c b/src/mesa/drivers/dri/common/dri_bufmgr.c
index f244b66699..db607a74cd 100644
--- a/src/mesa/drivers/dri/common/dri_bufmgr.c
+++ b/src/mesa/drivers/dri/common/dri_bufmgr.c
@@ -86,7 +86,7 @@ bmError(int val, const char *file, const char *function, int line)
 }
 
 DriFenceObject *
-driFenceBuffers(int fd, char *name, int shareable)
+driFenceBuffers(int fd, char *name, unsigned flags)
 {
    DriFenceObject *fence = (DriFenceObject *) malloc(sizeof(*fence));
    int ret;
@@ -99,7 +99,7 @@ driFenceBuffers(int fd, char *name, int shareable)
    fence->name = name;
    fence->fd = fd;
    _glthread_INIT_MUTEX(fence->mutex);
-   ret = drmFenceBuffers(fd, shareable, &fence->fence);
+   ret = drmFenceBuffers(fd, flags, &fence->fence);
    _glthread_UNLOCK_MUTEX(bmMutex);
    if (ret) {
       free(fence);
@@ -135,9 +135,10 @@ void
 driFenceFinish(DriFenceObject * fence, unsigned type, int lazy)
 {
    int ret;
+   unsigned flags = (lazy) ? DRM_FENCE_FLAG_WAIT_LAZY : 0;
 
    _glthread_LOCK_MUTEX(fence->mutex);
-   ret = drmFenceWait(fence->fd, &fence->fence, type, lazy, GL_FALSE);
+   ret = drmFenceWait(fence->fd, flags, &fence->fence, type);
    _glthread_UNLOCK_MUTEX(fence->mutex);
    BM_CKFATAL(ret);
 }
diff --git a/src/mesa/drivers/dri/common/dri_bufmgr.h b/src/mesa/drivers/dri/common/dri_bufmgr.h
index 426b4c8331..c742029135 100644
--- a/src/mesa/drivers/dri/common/dri_bufmgr.h
+++ b/src/mesa/drivers/dri/common/dri_bufmgr.h
@@ -40,7 +40,7 @@ struct _DriBufferObject;
 struct _DriBufferPool;
 
 extern struct _DriFenceObject *driFenceBuffers(int fd, char *name,
-                                               int shareable);
+                                               unsigned flags);
 
 extern void driFenceReference(struct _DriFenceObject *fence);
 
diff --git a/src/mesa/drivers/dri/i915/intel_batchbuffer.c b/src/mesa/drivers/dri/i915/intel_batchbuffer.c
index f7636c4bcd..02c8ab92cf 100644
--- a/src/mesa/drivers/dri/i915/intel_batchbuffer.c
+++ b/src/mesa/drivers/dri/i915/intel_batchbuffer.c
@@ -78,13 +78,6 @@ intel_dump_batchbuffer(GLuint offset, GLuint * ptr, GLuint count)
 }
 
 void
-dbatch(struct intel_context *intel)
-{
-   intel_dump_batchbuffer(0, intel->batch->map,
-                          intel->batch->ptr - intel->batch->map);
-}
-
-void
 intel_batchbuffer_reset(struct intel_batchbuffer *batch)
 {
 
@@ -225,7 +218,7 @@ do_flush_locked(struct intel_batchbuffer *batch,
 
 
    batch->last_fence = driFenceBuffers(batch->intel->driFd,
-                                       "Batch fence", GL_FALSE);
+                                       "Batch fence", 0);
 
    /*
     * User space fencing.
diff --git a/src/mesa/drivers/dri/i915/intel_batchpool.c b/src/mesa/drivers/dri/i915/intel_batchpool.c
index 5c69c1b8e1..acce037a5c 100644
--- a/src/mesa/drivers/dri/i915/intel_batchpool.c
+++ b/src/mesa/drivers/dri/i915/intel_batchpool.c
@@ -154,11 +154,11 @@ pool_checkFree(BPool * p, int wait)
 
       if (!signaled) {
          if (wait) {
-            driFenceFinish(buf->fence, DRM_FENCE_EXE, 1);
+            driFenceFinish(buf->fence, DRM_FENCE_TYPE_EXE, 1);
             signaled = 1;
          }
          else {
-            signaled = driFenceSignaled(buf->fence, DRM_FENCE_EXE);
+            signaled = driFenceSignaled(buf->fence, DRM_FENCE_TYPE_EXE);
          }
       }
 
diff --git a/src/mesa/drivers/dri/i915/intel_blit.c b/src/mesa/drivers/dri/i915/intel_blit.c
index 22c8fe1543..1fc91c444f 100644
--- a/src/mesa/drivers/dri/i915/intel_blit.c
+++ b/src/mesa/drivers/dri/i915/intel_blit.c
@@ -70,7 +70,7 @@ intelCopyBuffer(const __DRIdrawablePrivate * dPriv,
    }
    intel = (struct intel_context *) ctx;
    if (intel->last_swap_fence) {
-      driFenceFinish(intel->last_swap_fence, DRM_FENCE_EXE, GL_TRUE);
+      driFenceFinish(intel->last_swap_fence, DRM_FENCE_TYPE_EXE, GL_TRUE);
       driFenceUnReference(intel->last_swap_fence);
       intel->last_swap_fence = NULL;
    }
diff --git a/src/mesa/drivers/dri/i915/intel_context.c b/src/mesa/drivers/dri/i915/intel_context.c
index 145a71be3f..e83f26fdce 100644
--- a/src/mesa/drivers/dri/i915/intel_context.c
+++ b/src/mesa/drivers/dri/i915/intel_context.c
@@ -377,7 +377,7 @@ intelFinish(GLcontext * ctx)
    intelFlush(ctx);
    if (intel->batch->last_fence) {
       driFenceFinish(intel->batch->last_fence,
-                     DRM_FENCE_EXE | DRM_I915_FENCE_TYPE_RW, GL_FALSE);
+                     DRM_FENCE_TYPE_EXE | DRM_I915_FENCE_TYPE_RW, GL_FALSE);
       driFenceUnReference(intel->batch->last_fence);
       intel->batch->last_fence = NULL;
    }
diff --git a/src/mesa/drivers/dri/i915/intel_pixel_draw.c b/src/mesa/drivers/dri/i915/intel_pixel_draw.c
index 5b04cd6189..73685b11fb 100644
--- a/src/mesa/drivers/dri/i915/intel_pixel_draw.c
+++ b/src/mesa/drivers/dri/i915/intel_pixel_draw.c
@@ -328,7 +328,7 @@ do_blit_drawpixels(GLcontext * ctx,
    UNLOCK_HARDWARE(intel);
 
    if (intel->driDrawable->numClipRects)
-      driFenceFinish(fence, DRM_FENCE_EXE | DRM_I915_FENCE_TYPE_RW, GL_FALSE);
+      driFenceFinish(fence, DRM_FENCE_TYPE_EXE | DRM_I915_FENCE_TYPE_RW, GL_FALSE);
 
    driFenceUnReference(fence);
 
diff --git a/src/mesa/drivers/dri/i915/intel_pixel_read.c b/src/mesa/drivers/dri/i915/intel_pixel_read.c
index 5edfd79f4f..c1cc65674d 100644
--- a/src/mesa/drivers/dri/i915/intel_pixel_read.c
+++ b/src/mesa/drivers/dri/i915/intel_pixel_read.c
@@ -281,7 +281,8 @@ do_blit_readpixels(GLcontext * ctx,
    UNLOCK_HARDWARE(intel);
 
    if (intel->driDrawable->numClipRects)
-      driFenceFinish(fence, DRM_FENCE_EXE | DRM_I915_FENCE_TYPE_RW, GL_FALSE);
+      driFenceFinish(fence, DRM_FENCE_TYPE_EXE | DRM_I915_FENCE_TYPE_RW, 
+		     GL_FALSE);
 
    driFenceUnReference(fence);
    if (INTEL_DEBUG & DEBUG_PIXEL)