import Mesa 11.0.6

1 files changed, 11 insertions, 11 deletions

diff --git a/lib/mesa/src/gallium/winsys/svga/drm/vmw_fence.c b/lib/mesa/src/gallium/winsys/svga/drm/vmw_fence.c
index edf205e62..17822ce27 100644
--- a/lib/mesa/src/gallium/winsys/svga/drm/vmw_fence.c
+++ b/lib/mesa/src/gallium/winsys/svga/drm/vmw_fence.c
@@ -1,5 +1,5 @@
 /**********************************************************
- * Copyright 2009-2015 VMware, Inc.  All rights reserved.
+ * Copyright 2009-2011 VMware, Inc.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
@@ -40,7 +40,7 @@ struct vmw_fence_ops
    struct pb_fence_ops base;
    struct vmw_winsys_screen *vws;
 
-   mtx_t mutex;
+   pipe_mutex mutex;
 
    /*
     * Protected by mutex;
@@ -101,10 +101,10 @@ vmw_fences_release(struct vmw_fence_ops *ops)
 {
    struct vmw_fence *fence, *n;
 
-   mtx_lock(&ops->mutex);
+   pipe_mutex_lock(ops->mutex);
    LIST_FOR_EACH_ENTRY_SAFE(fence, n, &ops->not_signaled, ops_list)
       LIST_DELINIT(&fence->ops_list);
-   mtx_unlock(&ops->mutex);
+   pipe_mutex_unlock(ops->mutex);
 }
 
 /**
@@ -130,7 +130,7 @@ vmw_fences_signal(struct pb_fence_ops *fence_ops,
       return;
 
    ops = vmw_fence_ops(fence_ops);
-   mtx_lock(&ops->mutex);
+   pipe_mutex_lock(ops->mutex);
 
    if (!has_emitted) {
       emitted = ops->last_emitted;
@@ -152,7 +152,7 @@ vmw_fences_signal(struct pb_fence_ops *fence_ops,
    ops->last_emitted = emitted;
 
 out_unlock:
-   mtx_unlock(&ops->mutex);
+   pipe_mutex_unlock(ops->mutex);
 }
 
 
@@ -193,7 +193,7 @@ vmw_fence_create(struct pb_fence_ops *fence_ops, uint32_t handle,
    fence->mask = mask;
    fence->seqno = seqno;
    p_atomic_set(&fence->signalled, 0);
-   mtx_lock(&ops->mutex);
+   pipe_mutex_lock(ops->mutex);
 
    if (vmw_fence_seq_is_signaled(seqno, ops->last_signaled, seqno)) {
       p_atomic_set(&fence->signalled, 1);
@@ -203,7 +203,7 @@ vmw_fence_create(struct pb_fence_ops *fence_ops, uint32_t handle,
       LIST_ADDTAIL(&fence->ops_list, &ops->not_signaled);
    }
 
-   mtx_unlock(&ops->mutex);
+   pipe_mutex_unlock(ops->mutex);
 
    return (struct pipe_fence_handle *) fence;
 }
@@ -229,9 +229,9 @@ vmw_fence_reference(struct vmw_winsys_screen *vws,
 
 	 vmw_ioctl_fence_unref(vws, vfence->handle);
 
-         mtx_lock(&ops->mutex);
+         pipe_mutex_lock(ops->mutex);
          LIST_DELINIT(&vfence->ops_list);
-         mtx_unlock(&ops->mutex);
+         pipe_mutex_unlock(ops->mutex);
 
 	 FREE(vfence);
       }
@@ -421,7 +421,7 @@ vmw_fence_ops_create(struct vmw_winsys_screen *vws)
    if(!ops)
       return NULL;
 
-   (void) mtx_init(&ops->mutex, mtx_plain);
+   pipe_mutex_init(ops->mutex);
    LIST_INITHEAD(&ops->not_signaled);
    ops->base.destroy = &vmw_fence_ops_destroy;
    ops->base.fence_reference = &vmw_fence_ops_fence_reference;